Merge branch 'maint'
[git/git.git] / builtin-merge.c
2008-09-25 Shawn O. PearceMerge branch 'maint'
2008-09-24 Deskin Millermaint: check return of split_cmdline to avoid bad confi...
2008-09-23 Junio C HamanoMerge branch 'maint'
2008-09-22 Junio C HamanoMerge branch 'maint'
2008-09-22 Junio C HamanoMerge branch 'db/maint-checkout-b'
2008-09-20 Junio C HamanoMerge branch 'maint'
2008-09-19 Junio C HamanoMerge branch 'maint'
2008-09-19 Junio C HamanoMerge branch 'jc/diff-prefix'
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/maint-name-hash-clear' into maint
2008-09-16 Junio C HamanoMerge branch '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-10 Junio C HamanoMerge branch 'maint'
2008-09-10 Junio C HamanoMerge branch 'ho/dashless'
2008-09-08 Junio C HamanoMerge branch 'ar/autospell'
2008-09-08 Junio C HamanoMerge branch 'jc/cc-ld-dynpath'
2008-09-08 Junio C HamanoMerge branch 'jc/hide-cr-in-diff-from-less'
2008-09-08 Junio C HamanoMerge branch 'jc/maint-checkout-fix'
2008-09-07 Junio C HamanoMerge updated git-gui and gitk that call each other
2008-09-06 Junio C HamanoMerge branch 'maint'
2008-09-06 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-09-05 Junio C HamanoMerge branch 'jc/maint-log-grep'
2008-09-03 Junio C HamanoMerge branch 'maint'
2008-09-03 Junio C HamanoMerge branch 'tr/filter-branch'
2008-09-03 Junio C HamanoMerge branch 'np/maint-safer-pack'
2008-09-03 Junio C HamanoMerge branch 'jc/author-nickname'
2008-09-03 Junio C HamanoMerge branch 'maint'
2008-09-03 Junio C HamanoMerge branch 'np/maint-safer-pack' into np/pack
2008-08-31 Junio C HamanoMerge branch 'maint'
2008-08-31 Junio C HamanoMerge branch 'maint'
2008-08-30 Junio C HamanoMerge branch 'sp/missing-thin-base' into maint
2008-08-30 Junio C HamanoMerge branch 'sb/daemon'
2008-08-30 Junio C HamanoMerge branch 'np/verify-pack' into maint
2008-08-29 Junio C HamanoMerge branch 'maint'
2008-08-29 Alex RiesenRemove useless memset of static command name lists...
2008-08-29 Alex RiesenRemove calculation of the longest command name from...
2008-08-28 Junio C HamanoMerge branch 'mv/merge-custom'
2008-08-28 Junio C HamanoMerge branch 'ml/submodule'
2008-08-27 Junio C HamanoMerge branch 'am/cherry-pick-rerere'
2008-08-27 Junio C HamanoMerge branch 'jc/add-addremove'
2008-08-27 Junio C HamanoMerge branch 'np/verify-pack'
2008-08-27 Junio C HamanoMerge branch 'maint'
2008-08-27 Junio C HamanoMerge branch 'af/maint-install-no-handlink'
2008-08-27 Junio C HamanoMerge branch 'jc/no-slim-shell'
2008-08-27 Junio C HamanoMerge branch 'maint'
2008-08-24 Junio C HamanoMerge branch 'jc/no-slim-shell'
2008-08-24 Junio C HamanoMerge branch 'maint' to sync with 1.6.0.1
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 branch 'maint'
2008-08-24 Junio C Hamanomerge: fix numerus bugs around "trivial merge" area
2008-08-22 Paolo Bonziniprovide more errors for the "merge into empty head...
2008-08-21 Junio C HamanoMerge branch 'ml/submodule-foreach'
2008-08-21 Junio C HamanoMerge branch 'pm/log-exit-code'
2008-08-21 Junio C HamanoMerge branch 'sb/commit-tree-minileak'
2008-08-21 Junio C HamanoMerge branch 'pb/reflog-dwim'
2008-08-21 Junio C HamanoMerge branch 'jc/add-stop-at-symlink'
2008-08-21 Junio C HamanoMerge branch 'kh/diff-tree'
2008-08-21 Junio C HamanoMerge branch 'mg/count-objects'
2008-08-21 Junio C HamanoMerge branch 'mz/push-verbose'
2008-08-21 Junio C HamanoMerge branch 'jc/index-extended-flags'
2008-08-21 Junio C HamanoMerge branch 'cc/merge-base-many'
2008-08-21 Junio C HamanoMerge branch 'jc/test-deeper'
2008-08-21 Junio C HamanoMerge branch 'js/parallel-test'
2008-08-21 Junio C HamanoFix "git-merge -s bogo" help text
2008-08-20 Junio C HamanoMerge branch 'maint'
2008-08-20 Junio C Hamano"git-merge": allow fast-forwarding in a stat-dirty...
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-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-30 Miklos Vajnabuiltin-merge: allow using a custom strategy
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
next