projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Test tracking of non-commit upstreams
[git] / builtin-merge.c
2008-08-29  Alex RiesenRemove useless memset of static command name lists... blob | commitdiff | raw
2008-08-29  Alex RiesenRemove calculation of the longest command name from... blob | commitdiff | raw | diff to current
2008-08-28  Junio C HamanoMerge branch 'mv/merge-custom' blob | commitdiff | raw | diff to current
2008-08-28  Junio C HamanoMerge branch 'ml/submodule' blob | commitdiff | raw | diff to current
2008-08-27  Junio C HamanoMerge branch 'am/cherry-pick-rerere' blob | commitdiff | raw | diff to current
2008-08-27  Junio C HamanoMerge branch 'jc/add-addremove' blob | commitdiff | raw | diff to current
2008-08-27  Junio C HamanoMerge branch 'np/verify-pack' blob | commitdiff | raw | diff to current
2008-08-27  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-08-27  Junio C HamanoMerge branch 'af/maint-install-no-handlink' blob | commitdiff | raw | diff to current
2008-08-27  Junio C HamanoMerge branch 'jc/no-slim-shell' blob | commitdiff | raw | diff to current
2008-08-27  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-08-24  Junio C HamanoMerge branch 'jc/no-slim-shell' blob | commitdiff | raw | diff to current
2008-08-24  Junio C HamanoMerge branch 'maint' to sync with 1.6.0.1 blob | commitdiff | raw | diff to current
2008-08-24  Junio C HamanoMerge branch 'ag/maint-combine-diff-fix' into maint blob | commitdiff | raw | diff to current
2008-08-24  Junio C HamanoMerge branch 'mv/maint-merge-fix' into maint blob | commitdiff | raw | diff to current
2008-08-24  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-08-24  Junio C Hamanomerge: fix numerus bugs around "trivial merge" area blob | commitdiff | raw | diff to current
2008-08-22  Paolo Bonziniprovide more errors for the "merge into empty head... blob | commitdiff | raw | diff to current
2008-08-21  Junio C HamanoMerge branch 'ml/submodule-foreach' blob | commitdiff | raw | diff to current
2008-08-21  Junio C HamanoMerge branch 'pm/log-exit-code' blob | commitdiff | raw | diff to current
2008-08-21  Junio C HamanoMerge branch 'sb/commit-tree-minileak' blob | commitdiff | raw | diff to current
2008-08-21  Junio C HamanoMerge branch 'pb/reflog-dwim' blob | commitdiff | raw | diff to current
2008-08-21  Junio C HamanoMerge branch 'jc/add-stop-at-symlink' blob | commitdiff | raw | diff to current
2008-08-21  Junio C HamanoMerge branch 'kh/diff-tree' blob | commitdiff | raw | diff to current
2008-08-21  Junio C HamanoMerge branch 'mg/count-objects' blob | commitdiff | raw | diff to current
2008-08-21  Junio C HamanoMerge branch 'mz/push-verbose' blob | commitdiff | raw | diff to current
2008-08-21  Junio C HamanoMerge branch 'jc/index-extended-flags' blob | commitdiff | raw | diff to current
2008-08-21  Junio C HamanoMerge branch 'cc/merge-base-many' blob | commitdiff | raw | diff to current
2008-08-21  Junio C HamanoMerge branch 'jc/test-deeper' blob | commitdiff | raw | diff to current
2008-08-21  Junio C HamanoMerge branch 'js/parallel-test' blob | commitdiff | raw | diff to current
2008-08-21  Junio C HamanoFix "git-merge -s bogo" help text blob | commitdiff | raw | diff to current
2008-08-20  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-08-20  Junio C Hamano"git-merge": allow fast-forwarding in a stat-dirty... blob | commitdiff | raw | diff to current
2008-08-20  Junio C HamanoMerge branch 'ph/enable-threaded' blob | commitdiff | raw | diff to current
2008-08-20  Junio C HamanoMerge branch 'jk/pager-swap' blob | commitdiff | raw | diff to current
2008-08-20  Junio C HamanoMerge branch 'rs/imap' blob | commitdiff | raw | diff to current
2008-08-17  Junio C HamanoMerge git-gui 0.11.0 blob | commitdiff | raw | diff to current
2008-08-17  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2008-08-14  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-08-13  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-08-12  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-08-11  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-08-11  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-08-09  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-08-06  Junio C HamanoSync with 1.5.6.5 blob | commitdiff | raw | diff to current
2008-08-06  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2008-08-06  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2008-08-06  Junio C HamanoMerge branch 'rs/archive-parse-options' blob | commitdiff | raw | diff to current
2008-08-06  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-08-03  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-08-02  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-08-02  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-07-30  Junio C HamanoFix merge name generation in "merge in C" blob | commitdiff | raw | diff to current
2008-07-30  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2008-07-30  Miklos Vajnabuiltin-merge: allow using a custom strategy blob | commitdiff | raw | diff to current
2008-07-27  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2008-07-25  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-07-24  Junio C HamanoMerge branch 'maint' into ph/checkout blob | commitdiff | raw | diff to current
2008-07-24  Stephan BeyerMake non-static functions, that may be static, static blob | commitdiff | raw | diff to current
2008-07-22  Pierre Habouzitbuiltin-merge: add missing structure initialization blob | commitdiff | raw | diff to current
2008-07-22  Miklos Vajnabuiltin-merge: give a proper error message for invalid... blob | commitdiff | raw | diff to current
2008-07-21  Junio C HamanoMerge branch 'ap/trackinfo' v1.6.0-rc0 blob | commitdiff | raw | diff to current
2008-07-21  Junio C HamanoMerge branch 'jc/rerere-auto-more' blob | commitdiff | raw | diff to current
2008-07-21  Junio C HamanoMerge branch 'ns/am-abort' blob | commitdiff | raw | diff to current
2008-07-21  Junio C HamanoMerge branch 'jc/add-addremove' blob | commitdiff | raw | diff to current
2008-07-21  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-07-20  Michele Ballabiobuiltin-merge.c: Fix option parsing blob | commitdiff | raw | diff to current
2008-07-20  Miklos VajnaTeach 'git merge' that some merge strategies no longer... blob | commitdiff | raw | diff to current
2008-07-19  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-07-17  Junio C HamanoMerge branch 'mv/dashless' blob | commitdiff | raw | diff to current
2008-07-17  Junio C HamanoMerge branch 'ls/mailinfo' blob | commitdiff | raw | diff to current
2008-07-17  Junio C HamanoMerge branch 'sb/dashless' blob | commitdiff | raw | diff to current
2008-07-17  Junio C HamanoMerge branch 'rs/archive' blob | commitdiff | raw | diff to current
2008-07-17  Junio C HamanoMerge branch 'ag/blame' blob | commitdiff | raw | diff to current
2008-07-17  Junio C HamanoMerge branch 'rs/rebase-checkout-not-so-quiet' blob | commitdiff | raw | diff to current
2008-07-17  Junio C HamanoMerge branch 'sp/maint-index-pack' blob | commitdiff | raw | diff to current
2008-07-17  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-07-16  Junio C HamanoMerge branch 'mv/merge-in-c' blob | commitdiff | raw | diff to current
2008-07-10  Junio C HamanoTeach merge.log to "git-merge" again blob | commitdiff | raw | diff to current
2008-07-08  Miklos VajnaBuild in merge blob | commitdiff | raw | diff to current
Unnamed repository; edit this file 'description' to name the repository.