Andrew's git / gitweb.git / history
?
Merge branch 'am/cherry-pick-rerere'
[gitweb.git] / builtin-merge-recursive.c
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-22 Revert "Convert output messages in merge-recursive... blob | diff | raw
2008-08-20 Merge branch 'ph/enable-threaded' 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-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 '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-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-22 Rename path_list to string_list 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-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 'ag/blame' 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-15 add context pointer to read_tree_recursive() 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 'jc/branch-merged' blob | diff | raw | diff to current
2008-07-13 Merge branch 'ph/parseopt-step-blame' blob | diff | raw | diff to current
2008-07-09 Merge branch 'jc/reflog-expire' 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 Merge branch 'lt/racy-empty' into maint blob | diff | raw | diff to current
2008-07-07 Merge branch 'jc/rerere' blob | diff | raw | diff to current
2008-07-07 Merge branch 'dr/ceiling' blob | diff | raw | diff to current
2008-07-06 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-07-03 Merge branch 'j6t/mingw' blob | diff | raw | diff to current
2008-07-03 Merge branch 'jc/maint-reset' into maint blob | diff | raw | diff to current
2008-07-01 Merge branch 'ph/mergetool' blob | diff | raw | diff to current
2008-07-01 Merge branch 'jc/maint-reset' blob | diff | raw | diff to current
2008-07-01 Merge branch 'jc/dashless' (early part) blob | diff | raw | diff to current
2008-07-01 Merge branch 'nd/dashless' blob | diff | raw | diff to current
2008-07-01 Move commit_list_count() to commit.c blob | diff | raw | diff to current
2008-06-27 Merge branch 'maint-1.5.5' into maint blob | diff | raw | diff to current
2008-06-27 Merge branch 'maint-1.5.4' into maint-1.5.5 blob | diff | raw | diff to current
2008-06-25 Merge branch 'sb/rebase' blob | diff | raw | diff to current
2008-06-25 Merge branch 'lw/gitweb' blob | diff | raw | diff to current
2008-06-25 Merge branch 'lt/config-fsync' blob | diff | raw | diff to current
2008-06-25 Merge branch 'sr/tests' blob | diff | raw | diff to current
2008-06-25 Merge branch 'jh/clone-packed-refs' blob | diff | raw | diff to current
2008-06-25 Merge branch 'lw/perlish' blob | diff | raw | diff to current
2008-06-25 clone: create intermediate directories of destination... blob | diff | raw | diff to current
2008-06-25 Merge branch 'jc/maint-combine-diff-pre-context' into... blob | diff | raw | diff to current
2008-06-25 clone: create intermediate directories of destination... blob | diff | raw | diff to current
2008-06-22 Merge branch 'rs/archive-ignore' blob | diff | raw | diff to current
2008-06-22 Merge branch 'lt/racy-empty' blob | diff | raw | diff to current
2008-06-22 Merge branch 'jc/maint-combine-diff-pre-context' blob | diff | raw | diff to current
2008-06-22 Merge branch 'mo/status-untracked' blob | diff | raw | diff to current
2008-06-22 Merge branch 'kh/update-ref' blob | diff | raw | diff to current
2008-06-22 Merge branch 'rg/gitweb' blob | diff | raw | diff to current
2008-06-17 Merge branch 'maint' blob | diff | raw | diff to current
2008-06-16 Merge branch 'maint' blob | diff | raw | diff to current
2008-06-14 Merge branch 'rs/attr' blob | diff | raw | diff to current
2008-06-11 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2008-06-11 Merge branch 'maint' blob | diff | raw | diff to current
2008-06-09 Merge branch 'js/merge-recursive' blob | diff | raw | diff to current
2008-06-09 Merge branch 'maint' blob | diff | raw | diff to current
2008-06-09 merge-recursive: respect core.autocrlf when writing... blob | diff | raw | diff to current
2008-06-07 Merge 1.5.5.4 in blob | diff | raw | diff to current
2008-06-06 Merge branch 'maint' blob | diff | raw | diff to current
2008-06-04 Merge branch 'maint' blob | diff | raw | diff to current
2008-05-28 Merge 1.5.5.3 in blob | diff | raw | diff to current
2008-05-27 Merge branch 'jc/diff-no-no-index' blob | diff | raw | diff to current
2008-05-27 Merge branch 'maint' blob | diff | raw | diff to current
2008-05-27 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-05-26 Merge branch 'maint' blob | diff | raw | diff to current
2008-05-26 Merge branch 'maint-1.5.4' into maint blob | diff | raw | diff to current
2008-05-25 Merge branch 'js/config-cb' v1.5.6-rc0 blob | diff | raw | diff to current
next