Improve language in git-merge.txt and related docs
[git/git.git] / Documentation / merge-config.txt
2008-12-10 Ralf WildenhuesImprove language in git-merge.txt and related docs
2008-12-07 Junio C HamanoMerge branch 'maint'
2008-12-03 Junio C HamanoMerge branch 'maint'
2008-12-03 Junio C HamanoMerge branch 'maint'
2008-12-02 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-12-02 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-12-01 Junio C HamanoMerge branch 'maint'
2008-11-29 Junio C HamanoMerge branch 'nd/narrow' (early part) into jc/add-i-t-a
2008-11-28 Junio C HamanoMerge branch 'cc/bisect-skip'
2008-11-28 Junio C HamanoMerge branch 'js/mingw-rename-fix'
2008-11-28 Junio C HamanoMerge branch 'st/levenshtein'
2008-11-28 Junio C HamanoMerge branch 'cr/remote-update-v'
2008-11-28 Junio C HamanoMerge branch 'rs/strbuf-expand'
2008-11-28 Junio C HamanoMerge branch 'mv/clone-strbuf'
2008-11-28 Junio C HamanoMerge branch 'lt/preload-lstat'
2008-11-28 Junio C HamanoMerge branch 'ta/quiet-pull'
2008-11-28 Junio C HamanoMerge branch 'ph/send-email'
2008-11-28 Junio C HamanoMerge branch 'maint'
2008-11-27 Junio C HamanoMerge branch 'rw/maint-typofix' into rw/typofix
2008-11-26 Junio C HamanoMerge branch 'maint'
2008-11-26 Junio C HamanoMerge branch 'mm/sort-config-doc'
2008-11-26 Junio C HamanoMerge branch 'mm/maint-sort-config-doc' into mm/sort...
2008-11-16 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-11-13 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-11-13 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-11-02 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-11-02 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-10-21 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-10-18 Junio C HamanoMerge branch 'pb/commit-where'
2008-10-09 Shawn O. PearceMerge branch 'lt/time-reject-fractional-seconds'
2008-10-09 Shawn O. PearceMerge branch 'jc/add-ita'
2008-09-29 Shawn O. PearceMerge branch 'jc/better-conflict-resolution'
2008-09-25 Shawn O. PearceMerge branch 'mv/merge-recursive'
2008-09-25 Shawn O. PearceMerge branch 'jc/alternate-push'
2008-09-25 Shawn O. PearceMerge branch 'am/status'
2008-09-25 Shawn O. PearceMerge branch 'pb/autocorrect-wrapper'
2008-09-25 Shawn O. PearceMerge branch 'mv/commit-tree'
2008-09-25 Shawn O. PearceMerge branch 'jc/apply-include-exclude'
2008-09-25 Shawn O. PearceMerge branch 'jc/safe-c-l-d'
2008-09-25 Shawn O. PearceMerge branch 'ho/dirstat-by-file'
2008-09-25 Shawn O. PearceMerge git://repo.or.cz/git-gui
2008-09-19 Junio C HamanoMerge branch 'bc/maint-diff-hunk-header-fix' into bc...
2008-09-19 Junio C HamanoMerge branch 'jc/diff-prefix'
2008-09-19 Junio C HamanoMerge branch 'np/pack'
2008-09-19 Junio C HamanoMerge branch 'bw/shortref'
2008-09-19 Junio C HamanoMerge branch 'rs/decorate'
2008-09-19 Junio C HamanoMerge branch 'tr/rev-list-reverse'
2008-09-19 Junio C HamanoMerge branch 'cc/bisect'
2008-09-19 Junio C HamanoMerge branch 'jc/setlinebuf-setvbuf'
2008-09-19 Junio C HamanoMerge branch 'dp/maint-rebase-fix' into maint
2008-09-19 Junio C HamanoMerge branch 'jc/maint-checkout-keep-remove' into maint
2008-09-19 Junio C HamanoMerge branch 'jc/maint-diff-quiet' into maint
2008-09-19 Junio C HamanoMerge branch 'jc/maint-name-hash-clear' into maint
2008-09-19 Junio C HamanoMerge branch 'jc/maint-template-permbits' into maint
2008-09-19 Junio C HamanoMerge branch 'mh/maint-honor-no-ssl-verify' into maint
2008-09-16 Junio C HamanoMerge branch 'dp/maint-rebase-fix'
2008-09-16 Junio C HamanoMerge branch 'jc/maint-checkout-keep-remove'
2008-09-16 Junio C HamanoMerge branch 'jc/maint-diff-quiet'
2008-09-16 Junio C HamanoMerge branch 'jc/maint-name-hash-clear'
2008-09-16 Junio C HamanoMerge branch 'jc/maint-template-permbits'
2008-09-16 Junio C HamanoMerge branch 'mh/maint-honor-no-ssl-verify'
2008-09-13 Junio C HamanoSync with 1.6.0.2
2008-09-12 Junio C HamanoMerge branch 'ho/maint-dashless' into maint
2008-09-12 Ralf WildenhuesFix some manual typos.
2008-09-07 Junio C HamanoMerge updated git-gui and gitk that call each other
2008-09-06 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-08-30 Junio C HamanoMerge branch 'jc/post-simplify' (early part) into tr...
2008-08-28 Junio C HamanoMerge branch 'mv/merge-custom'
2008-08-27 Junio C HamanoMerge branch 'jc/add-addremove'
2008-08-21 Junio C HamanoMerge branch 'jc/add-stop-at-symlink'
2008-08-21 Junio C HamanoMerge branch 'cc/merge-base-many'
2008-08-20 Junio C HamanoMerge branch 'dp/hash-literally'
2008-08-20 Junio C HamanoMerge branch 'ph/enable-threaded'
2008-08-20 Junio C HamanoMerge branch 'jk/pager-swap'
2008-08-20 Junio C HamanoMerge branch 'rs/imap'
2008-08-17 Junio C HamanoMerge git-gui 0.11.0
2008-08-17 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-14 Junio C HamanoMerge branch 'maint'
2008-08-13 Junio C HamanoMerge branch 'maint'
2008-08-13 Junio C HamanoMerge branch 'jc/post-simplify' into tr/rev-list-docs
2008-08-13 Junio C HamanoMerge branch 'jc/post-simplify' into tr/filter-branch
2008-08-12 Junio C HamanoMerge branch 'maint'
2008-08-11 Junio C HamanoMerge branch 'maint'
2008-08-11 Junio C HamanoMerge branch 'maint'
2008-08-09 Junio C HamanoMerge branch 'maint'
2008-08-06 Junio C HamanoSync with 1.5.6.5
2008-08-06 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-08-06 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-06 Junio C HamanoMerge branch 'rs/archive-parse-options'
2008-08-06 Mike RalphsonDocumentation: typos / spelling fixes
2008-07-30 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-07-27 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-07-15 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-07-08 Junio C HamanoMerge branch 'jc/blame' (early part) into HEAD
2008-07-08 Junio C HamanoMerge branch 'lt/racy-empty' into maint
2008-07-06 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-06-27 Junio C HamanoMerge branch 'maint-1.5.5' into maint
2008-06-25 Junio C HamanoMerge branch 'jc/maint-combine-diff-pre-context' into...
next