maint: check return of split_cmdline to avoid bad config strings
[git/git.git] / builtin-merge.c
2008-09-24 Deskin Millermaint: check return of split_cmdline to avoid bad confi...
2008-09-19 Junio C HamanoMerge branch 'jc/maint-name-hash-clear' into maint
2008-09-06 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-08-30 Junio C HamanoMerge branch 'sp/missing-thin-base' into maint
2008-08-30 Junio C HamanoMerge branch 'np/verify-pack' into maint
2008-08-24 Junio C HamanoMerge branch 'ag/maint-combine-diff-fix' into maint
2008-08-24 Junio C HamanoMerge branch 'mv/maint-merge-fix' into maint
2008-08-24 Junio C Hamanomerge: fix numerus bugs around "trivial merge" area
2008-08-20 Junio C Hamano"git-merge": allow fast-forwarding in a stat-dirty...
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-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 Junio C HamanoMerge branch 'maint'
2008-08-03 Junio C HamanoMerge branch 'maint'
2008-08-02 Junio C HamanoMerge branch 'maint'
2008-08-02 Junio C HamanoMerge branch 'maint'
2008-07-30 Junio C HamanoFix merge name generation in "merge in C"
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-25 Junio C HamanoMerge branch 'maint'
2008-07-24 Junio C HamanoMerge branch 'maint' into ph/checkout
2008-07-24 Stephan BeyerMake non-static functions, that may be static, static
2008-07-22 Pierre Habouzitbuiltin-merge: add missing structure initialization
2008-07-22 Miklos Vajnabuiltin-merge: give a proper error message for invalid...
2008-07-21 Junio C HamanoMerge branch 'ap/trackinfo' v1.6.0-rc0
2008-07-21 Junio C HamanoMerge branch 'jc/rerere-auto-more'
2008-07-21 Junio C HamanoMerge branch 'ns/am-abort'
2008-07-21 Junio C HamanoMerge branch 'jc/add-addremove'
2008-07-21 Junio C HamanoMerge branch 'maint'
2008-07-20 Michele Ballabiobuiltin-merge.c: Fix option parsing
2008-07-20 Miklos VajnaTeach 'git merge' that some merge strategies no longer...
2008-07-19 Junio C HamanoMerge branch 'maint'
2008-07-17 Junio C HamanoMerge branch 'mv/dashless'
2008-07-17 Junio C HamanoMerge branch 'ls/mailinfo'
2008-07-17 Junio C HamanoMerge branch 'sb/dashless'
2008-07-17 Junio C HamanoMerge branch 'rs/archive'
2008-07-17 Junio C HamanoMerge branch 'ag/blame'
2008-07-17 Junio C HamanoMerge branch 'rs/rebase-checkout-not-so-quiet'
2008-07-17 Junio C HamanoMerge branch 'sp/maint-index-pack'
2008-07-17 Junio C HamanoMerge branch 'maint'
2008-07-16 Junio C HamanoMerge branch 'mv/merge-in-c'
2008-07-10 Junio C HamanoTeach merge.log to "git-merge" again
2008-07-08 Miklos VajnaBuild in merge