Andrew's git - gitweb.git/history

[gitweb.git] / git-merge.sh

2007-09-24	git-merge: add --ff and --no-ff options	blob \| diff \| raw
2007-09-24	git-merge: add support for --commit and --no-squash	blob \| diff \| raw \| diff to current
2007-09-24	git-merge: add support for branch.<name>.mergeoptions	blob \| diff \| raw \| diff to current
2007-09-24	git-merge: refactor option parsing	blob \| diff \| raw \| diff to current
2007-09-24	git-merge: fix faulty SQUASH_MSG	blob \| diff \| raw \| diff to current
2007-09-24	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-09-24	Merge branch 'maint' of git://linux-nfs.org/~bfields...	blob \| diff \| raw \| diff to current
2007-09-23	Supplant the "while case ... break ;; esac" idiom	blob \| diff \| raw \| diff to current
2007-09-19	Add post-merge hook, related documentation, and tests.	blob \| diff \| raw \| diff to current
2007-09-18	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2007-09-06	Invoke "git gc --auto" from commit, merge, am and rebase.	blob \| diff \| raw \| diff to current
2007-09-01	Merge branch 'jp/send-email-cc'	blob \| diff \| raw \| diff to current
2007-08-29	Merge branch 'master' of git://git./gitk/gitk	blob \| diff \| raw \| diff to current
2007-08-28	git-merge: do up-to-date check also for all strategies	blob \| diff \| raw \| diff to current
2007-08-27	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2007-08-26	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-08-21	Merge branch 'master' of git://git./gitk/gitk	blob \| diff \| raw \| diff to current
2007-08-19	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2007-08-19	Merge branch 'master' of git://git./gitk/gitk	blob \| diff \| raw \| diff to current
2007-08-16	Merge branch 'maint' to sync with 1.5.2.5	blob \| diff \| raw \| diff to current
2007-08-13	Merge branch 'master' of git://git./gitk/gitk	blob \| diff \| raw \| diff to current
2007-08-06	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-08-05	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-08-01	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-07-30	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2007-07-28	Merge branch 'master' of git://git./gitk/gitk	blob \| diff \| raw \| diff to current
2007-07-19	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-07-14	Merge branch 'master' of git://git./gitk/gitk	blob \| diff \| raw \| diff to current
2007-07-12	Merge branch 'master' of git://git./gitk/gitk	blob \| diff \| raw \| diff to current
2007-07-12	Merge commit 'git-gui/master'	blob \| diff \| raw \| diff to current
2007-07-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-07-12	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2007-07-10	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-07-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-07-07	Merge branch 'js/stash'	blob \| diff \| raw \| diff to current
2007-07-07	Merge branch 'jc/diff-mark'	blob \| diff \| raw \| diff to current
2007-07-07	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-07-07	Enable "git rerere" by the config variable rerere.enabled	blob \| diff \| raw \| diff to current
2007-07-04	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-07-03	Rewrite "git-frotz" to "git frotz"	blob \| diff \| raw \| diff to current
2007-07-03	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-07-03	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-07-02	Merge 1.5.2.3 in	blob \| diff \| raw \| diff to current
2007-06-30	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-06-29	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-06-29	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2007-06-29	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2007-06-28	Merge branch 'master' of git://git./gitk/gitk	blob \| diff \| raw \| diff to current
2007-06-27	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-06-26	Merge branch 'master' of git://git./gitk/gitk into...	blob \| diff \| raw \| diff to current
2007-06-22	Import branch 'git-p4' of git://repo.or.cz/fast-export	blob \| diff \| raw \| diff to current
2007-06-16	Merge branch 'maint' to sync with GIT 1.5.2.2	blob \| diff \| raw \| diff to current
2007-06-13	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-06-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-06-12	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2007-06-12	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2007-06-11	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2007-06-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-06-11	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2007-06-10	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-06-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-06-09	Merge branch 'ar/clone'	blob \| diff \| raw \| diff to current
2007-06-08	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-06-06	Merge branch 'sv/objfixes'	blob \| diff \| raw \| diff to current
2007-06-03	Merge branch 'maint' to sync with 1.5.2.1	blob \| diff \| raw \| diff to current
2007-06-03	Merge branches 'lh/submodules' and 'pb/am'	blob \| diff \| raw \| diff to current
2007-06-02	Merge branch 'sp/pack'	blob \| diff \| raw \| diff to current
2007-06-02	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-05-31	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-05-31	Merge branch 'maint-1.5.1' into maint	blob \| diff \| raw \| diff to current
2007-05-29	Merge branch 'db/remote'	blob \| diff \| raw \| diff to current
2007-05-29	Merge branch 'dh/repack' (early part)	blob \| diff \| raw \| diff to current
2007-05-29	Merge branch 'np/delta'	blob \| diff \| raw \| diff to current
2007-05-29	Merge branch 'jc/nodelta'	blob \| diff \| raw \| diff to current
2007-05-29	Merge branch 'ar/verbose'	blob \| diff \| raw \| diff to current
2007-05-29	Merge branch 'ar/run'	blob \| diff \| raw \| diff to current
2007-05-29	Merge branch 'ar/mergestat'	blob \| diff \| raw \| diff to current
2007-05-29	Merge branch 'rr/cvsexport'	blob \| diff \| raw \| diff to current
2007-05-29	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-05-29	Merge branch 'maint-1.5.1' into maint	blob \| diff \| raw \| diff to current
2007-05-29	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2007-05-27	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-05-26	Merge branch 'maint-1.5.1' into maint	blob \| diff \| raw \| diff to current
2007-05-26	More echo "$user_message" fixes.	blob \| diff \| raw \| diff to current
2007-05-25	Add a configuration option to control diffstat after...	blob \| diff \| raw \| diff to current
2007-05-25	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-05-25	Merge branch 'maint-1.5.1' into maint	blob \| diff \| raw \| diff to current
2007-05-24	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-05-24	Merge branch 'maint-1.5.1' into maint	blob \| diff \| raw \| diff to current
2007-05-23	Merge branch 'ar/progress'	blob \| diff \| raw \| diff to current
2007-05-23	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-05-23	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-05-23	Merge branch 'maint-1.5.1' into maint	blob \| diff \| raw \| diff to current
2007-05-22	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-05-22	Merge branch 'maint-1.5.1' into maint	blob \| diff \| raw \| diff to current
2007-05-21	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-05-21	Merge branch 'maint-1.5.1' into maint	blob \| diff \| raw \| diff to current
2007-05-20	Merge branch 'dh/pack'	blob \| diff \| raw \| diff to current
2007-05-20	Merge branch 'mst/connect'	blob \| diff \| raw \| diff to current
2007-05-20	Merge branch 'sv/checkout'	blob \| diff \| raw \| diff to current
next