Andrew's git / gitweb.git / history
?
autodetect number of CPUs by default when using threads
[gitweb.git] / Documentation / git-merge.txt
2008-09-08 Merge branch 'jc/maint-checkout-fix' blob | diff | raw
2008-09-07 Merge updated git-gui and gitk that call each other blob | diff | raw
2008-09-06 Merge branch 'maint' blob | diff | raw
2008-09-06 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw | diff to current
2008-09-05 Merge branch 'jc/maint-log-grep' blob | diff | raw
2008-09-04 Fix AsciiDoc errors in merge documentation blob | diff | raw | diff to current
2008-09-03 Merge branch 'maint' blob | diff | raw
2008-09-03 Merge branch 'tr/filter-branch' blob | diff | raw
2008-09-03 Merge branch 'np/maint-safer-pack' blob | diff | raw
2008-09-03 Merge branch 'jc/author-nickname' blob | diff | raw
2008-09-03 Merge branch 'maint' blob | diff | raw
2008-09-03 Merge branch 'np/maint-safer-pack' into np/pack blob | diff | raw
2008-09-01 git-merge documentation: describe how conflict is presented blob | diff | raw | diff to current
2008-08-31 Merge branch 'maint' blob | diff | raw
2008-08-31 Merge branch 'maint' blob | diff | raw
2008-08-30 Merge branch 'sb/daemon' blob | diff | raw
2008-08-29 Merge branch 'maint' blob | diff | raw
2008-08-28 Merge branch 'mv/merge-custom' blob | diff | raw
2008-08-28 Merge branch 'ml/submodule' blob | diff | raw
2008-08-27 Merge branch 'am/cherry-pick-rerere' blob | diff | raw
2008-08-27 Merge branch 'jc/add-addremove' blob | diff | raw
2008-08-27 Merge branch 'np/verify-pack' blob | diff | raw
2008-08-27 Merge branch 'maint' blob | diff | raw
2008-08-27 Merge branch 'af/maint-install-no-handlink' blob | diff | raw
2008-08-27 Merge branch 'jc/no-slim-shell' blob | diff | raw
2008-08-27 Merge branch 'maint' blob | diff | raw
2008-08-24 Merge branch 'jc/no-slim-shell' blob | diff | raw
2008-08-24 Merge branch 'maint' to sync with 1.6.0.1 blob | diff | raw
2008-08-24 Merge branch 'maint' blob | diff | raw
2008-08-23 git-merge documentation: more details about resolving... blob | diff | raw
2008-08-21 Merge branch 'cc/merge-base-many' blob | diff | raw | diff to current
2008-08-20 Merge branch 'ph/enable-threaded' blob | diff | raw | diff to current
2008-08-20 Merge branch 'jk/pager-swap' blob | diff | raw | diff to current
2008-08-20 Merge branch 'rs/imap' blob | diff | raw | diff to current
2008-08-17 Merge git-gui 0.11.0 blob | diff | raw | diff to current
2008-08-17 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2008-08-14 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-13 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-12 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-11 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-11 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-09 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-07 Merge branch 'lt/config-fsync' into maint blob | diff | raw | diff to current
2008-08-07 Merge branch 'jc/reflog-expire' into maint blob | diff | raw | diff to current
2008-08-07 Merge branch 'ag/rewrite_one' into maint blob | diff | raw | diff to current
2008-08-06 Sync with 1.5.6.5 blob | diff | raw | diff to current
2008-08-06 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-08-06 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2008-08-06 Merge branch 'rs/archive-parse-options' blob | diff | raw | diff to current
2008-08-06 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-03 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-02 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-02 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-02 Update my e-mail address blob | diff | raw | diff to current
2008-07-31 Make the DESCRIPTION match <x>... items in the SYNOPSIS blob | diff | raw | diff to current
2008-07-30 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-07-27 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-07-25 Merge branch 'maint' blob | diff | raw | diff to current
2008-07-24 Merge branch 'maint' into ph/checkout blob | diff | raw | diff to current
2008-07-21 Update my e-mail address blob | diff | raw | diff to current
2008-07-21 Merge branch 'ap/trackinfo' v1.6.0-rc0 blob | diff | raw | diff to current
2008-07-21 Merge branch 'jc/rerere-auto-more' blob | diff | raw | diff to current
2008-07-21 Merge branch 'ns/am-abort' blob | diff | raw | diff to current
2008-07-21 Merge branch 'maint' blob | diff | raw | diff to current
2008-07-19 Merge branch 'maint' blob | diff | raw | diff to current
2008-07-19 Documentation/git-merge.txt: Partial rewrite of How... blob | diff | raw | diff to current
2008-07-17 Merge branch 'mv/dashless' blob | diff | raw | diff to current
2008-07-17 Merge branch 'ls/mailinfo' blob | diff | raw | diff to current
2008-07-17 Merge branch 'sb/dashless' blob | diff | raw | diff to current
2008-07-17 Merge branch 'rs/archive' blob | diff | raw | diff to current
2008-07-17 Merge branch 'rs/rebase-checkout-not-so-quiet' blob | diff | raw | diff to current
2008-07-17 Merge branch 'sp/maint-index-pack' blob | diff | raw | diff to current
2008-07-17 Merge branch 'maint' blob | diff | raw | diff to current
2008-07-16 Merge branch 'mv/merge-in-c' blob | diff | raw | diff to current
2008-07-16 Merge branch 'ag/rewrite_one' blob | diff | raw | diff to current
2008-07-16 Merge branch 'sp/win' blob | diff | raw | diff to current
2008-07-16 Merge branch 'js/more-win' blob | diff | raw | diff to current
2008-07-16 Merge branch 'js/maint-pretty-mailmap' blob | diff | raw | diff to current
2008-07-15 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-07-15 Merge branch 'js/merge-rr' blob | diff | raw | diff to current
2008-07-15 Merge branch 'sb/rerere-lib' blob | diff | raw | diff to current
2008-07-15 Merge branch 'ls/maint-mailinfo-patch-label' blob | diff | raw | diff to current
2008-07-15 Merge branch 'om/rerere-careful' blob | diff | raw | diff to current
2008-07-15 Merge branch 'jc/branch-merged' blob | diff | raw | diff to current
2008-07-15 Merge branch 'jc/rebase-orig-head' blob | diff | raw | diff to current
2008-07-15 Merge branch 'sp/maint-bash-completion-optim' blob | diff | raw | diff to current
2008-07-13 Merge branch 'sp/maint-bash-completion-optim' blob | diff | raw | diff to current
2008-07-13 Merge branch 'maint' to sync with 1.5.6.3 blob | diff | raw | diff to current
2008-07-13 Merge branch 'ph/parseopt-step-blame' blob | diff | raw | diff to current
2008-07-13 Merge branch 'am/stash-branch' blob | diff | raw | diff to current
2008-07-13 Merge branch 'sg/stash-k-i' blob | diff | raw | diff to current
2008-07-13 Merge branch 'jc/report-tracking' blob | diff | raw | diff to current
2008-07-13 Merge branch 'tr/add-i-e' blob | diff | raw | diff to current
2008-07-09 Merge branch 'js/apply-root' blob | diff | raw | diff to current
2008-07-09 Merge branch 'jc/reflog-expire' blob | diff | raw | diff to current
2008-07-09 Merge branch 'sp/maint-pack-memuse' blob | diff | raw | diff to current
2008-07-09 Merge branch 'maint' blob | diff | raw | diff to current
2008-07-08 Merge branch 'jc/blame' (early part) into HEAD blob | diff | raw | diff to current
2008-07-08 Documentation: mention ORIG_HEAD in am, merge, and... blob | diff | raw | diff to current
2008-07-08 Merge branch 'lt/racy-empty' into maint blob | diff | raw | diff to current
next