Andrew's git - gitweb.git/history

[gitweb.git] / builtin-merge.c

2008-10-09	Merge branch 'mw/sendemail'	blob \| diff \| raw
2008-10-09	Merge branch 'mv/merge-refresh'	blob \| diff \| raw
2008-10-09	Merge branch 'ph/parseopt'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'rz/grepz'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'mg/verboseprune'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'sg/maint-intrebase-msghook' into maint	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'jk/maint-soliconv' into maint	blob \| diff \| raw \| diff to current
2008-10-09	builtin-merge.c: allocate correct amount of memory	blob \| diff \| raw \| diff to current
2008-10-08	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-08	Replace xmalloc/memset(0) pairs with xcalloc	blob \| diff \| raw \| diff to current
2008-10-06	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-03	builtin-commit: use reduce_heads() only when appropriate	blob \| diff \| raw \| diff to current
2008-10-03	builtin-merge: refresh the index before calling a strategy	blob \| diff \| raw \| diff to current
2008-10-03	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-01	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-30	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-29	Merge branch 'bc/master-diff-hunk-header-fix'	blob \| diff \| raw \| diff to current
2008-09-29	Merge branch 'maint' into bc/master-diff-hunk-header-fix	blob \| diff \| raw \| diff to current
2008-09-29	Merge branch 'bc/maint-diff-hunk-header-fix' into maint	blob \| diff \| raw \| diff to current
2008-09-29	Merge branch 'jc/better-conflict-resolution'	blob \| diff \| raw \| diff to current
2008-09-29	Merge branch 'mg/maint-remote-fix' into maint	blob \| diff \| raw \| diff to current
2008-09-26	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-25	Merge branch 'mv/merge-recursive'	blob \| diff \| raw \| diff to current
2008-09-25	Merge branch 'jc/alternate-push'	blob \| diff \| raw \| diff to current
2008-09-25	Merge branch 'am/status'	blob \| diff \| raw \| diff to current
2008-09-25	Merge branch 'pb/autocorrect-wrapper'	blob \| diff \| raw \| diff to current
2008-09-25	Merge branch 'mv/commit-tree'	blob \| diff \| raw \| diff to current
2008-09-25	Merge branch 'jc/apply-include-exclude'	blob \| diff \| raw \| diff to current
2008-09-25	Merge branch 'jc/safe-c-l-d'	blob \| diff \| raw \| diff to current
2008-09-25	Merge branch 'ho/dirstat-by-file'	blob \| diff \| raw \| diff to current
2008-09-25	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-09-25	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-24	maint: check return of split_cmdline to avoid bad confi...	blob \| diff \| raw \| diff to current
2008-09-23	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-23	Merge branch 'bc/maint-diff-hunk-header-fix' into bc...	blob \| diff \| raw \| diff to current
2008-09-22	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-22	Merge branch 'db/maint-checkout-b'	blob \| diff \| raw \| diff to current
2008-09-21	Merge branch 'bc/maint-diff-hunk-header-fix' into bc...	blob \| diff \| raw \| diff to current
2008-09-20	Merge branch 'bc/maint-diff-hunk-header-fix' into bc...	blob \| diff \| raw \| diff to current
2008-09-20	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-19	Merge branch 'bc/maint-diff-hunk-header-fix' into bc...	blob \| diff \| raw \| diff to current
2008-09-19	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-19	Merge branch 'jc/diff-prefix'	blob \| diff \| raw \| diff to current
2008-09-19	Merge branch 'tr/rev-list-reverse'	blob \| diff \| raw \| diff to current
2008-09-19	Merge branch 'cc/bisect'	blob \| diff \| raw \| diff to current
2008-09-19	Merge branch 'jc/maint-name-hash-clear' into maint	blob \| diff \| raw \| diff to current
2008-09-16	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-16	Merge branch 'dp/maint-rebase-fix'	blob \| diff \| raw \| diff to current
2008-09-16	Merge branch 'jc/maint-checkout-keep-remove'	blob \| diff \| raw \| diff to current
2008-09-16	Merge branch 'jc/maint-diff-quiet'	blob \| diff \| raw \| diff to current
2008-09-16	Merge branch 'jc/maint-name-hash-clear'	blob \| diff \| raw \| diff to current
2008-09-16	Merge branch 'jc/maint-template-permbits'	blob \| diff \| raw \| diff to current
2008-09-16	Merge branch 'mh/maint-honor-no-ssl-verify'	blob \| diff \| raw \| diff to current
2008-09-13	Sync with 1.6.0.2	blob \| diff \| raw \| diff to current
2008-09-10	commit_tree(): add a new author parameter	blob \| diff \| raw \| diff to current
2008-09-10	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-10	Merge branch 'ho/dashless'	blob \| diff \| raw \| diff to current
2008-09-08	Merge branch 'ar/autospell'	blob \| diff \| raw \| diff to current
2008-09-08	Merge branch 'jc/cc-ld-dynpath'	blob \| diff \| raw \| diff to current
2008-09-08	Merge branch 'jc/hide-cr-in-diff-from-less'	blob \| diff \| raw \| diff to current
2008-09-08	Merge branch 'jc/maint-checkout-fix'	blob \| diff \| raw \| diff to current
2008-09-07	builtin-merge: release the lockfile in try_merge_strategy()	blob \| diff \| raw \| diff to current
2008-09-07	Merge updated git-gui and gitk that call each other	blob \| diff \| raw \| diff to current
2008-09-06	Merge branch 'maint'	blob \| diff \| raw \| diff to current
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 \| diff to current
2008-09-03	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-03	Merge branch 'tr/filter-branch'	blob \| diff \| raw \| diff to current
2008-09-03	Merge branch 'np/maint-safer-pack'	blob \| diff \| raw \| diff to current
2008-09-03	Merge branch 'jc/author-nickname'	blob \| diff \| raw \| diff to current
2008-09-03	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-03	Merge branch 'np/maint-safer-pack' into np/pack	blob \| diff \| raw \| diff to current
2008-08-31	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-31	builtin-merge: avoid run_command_v_opt() for recursive...	blob \| diff \| raw \| diff to current
2008-08-31	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-30	Merge branch 'sp/missing-thin-base' into maint	blob \| diff \| raw \| diff to current
2008-08-30	Merge branch 'sb/daemon'	blob \| diff \| raw \| diff to current
2008-08-30	Merge branch 'np/verify-pack' into maint	blob \| diff \| raw \| diff to current
2008-08-29	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-29	Remove useless memset of static command name lists...	blob \| diff \| raw \| diff to current
2008-08-29	Remove calculation of the longest command name from...	blob \| diff \| raw \| diff to current
2008-08-28	Merge branch 'mv/merge-custom'	blob \| diff \| raw \| diff to current
2008-08-28	Merge branch 'ml/submodule'	blob \| diff \| raw \| diff to current
2008-08-27	Merge branch 'am/cherry-pick-rerere'	blob \| diff \| raw \| diff to current
2008-08-27	Merge branch 'jc/add-addremove'	blob \| diff \| raw \| diff to current
2008-08-27	Merge branch 'np/verify-pack'	blob \| diff \| raw \| diff to current
2008-08-27	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-27	Merge branch 'af/maint-install-no-handlink'	blob \| diff \| raw \| diff to current
2008-08-27	Merge branch 'jc/no-slim-shell'	blob \| diff \| raw \| diff to current
2008-08-27	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-24	Merge branch 'jc/no-slim-shell'	blob \| diff \| raw \| diff to current
2008-08-24	Merge branch 'maint' to sync with 1.6.0.1	blob \| diff \| raw \| diff to current
2008-08-24	Merge branch 'ag/maint-combine-diff-fix' into maint	blob \| diff \| raw \| diff to current
2008-08-24	Merge branch 'mv/maint-merge-fix' into maint	blob \| diff \| raw \| diff to current
2008-08-24	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-24	merge: fix numerus bugs around "trivial merge" area	blob \| diff \| raw \| diff to current
2008-08-22	provide more errors for the "merge into empty head...	blob \| diff \| raw \| diff to current
2008-08-21	Merge branch 'ml/submodule-foreach'	blob \| diff \| raw \| diff to current
2008-08-21	Merge branch 'pm/log-exit-code'	blob \| diff \| raw \| diff to current
next