Andrew's git - gitweb.git/history

[gitweb.git] / git-merge.sh

2007-11-08	Merge branch 'ds/maint-deflatebound'	blob \| diff \| raw
2007-11-08	Merge branch 'maint'	blob \| diff \| raw
2007-11-06	Migrate git-merge.sh to use git-rev-parse --parseopt	blob \| diff \| raw \| diff to current
2007-11-06	Merge branch 'maint'	blob \| diff \| raw
2007-11-04	Merge branch 'maint'	blob \| diff \| raw
2007-11-02	Merge branch 'maint'	blob \| diff \| raw
2007-11-02	Merge branch 'gp/maint-diffdoc'	blob \| diff \| raw
2007-11-02	Merge branch 'maint'	blob \| diff \| raw
2007-11-01	Merge branch 'bk/maint-cvsexportcommit'	blob \| diff \| raw
2007-11-01	git-merge: no reason to use cpio anymore	blob \| diff \| raw \| diff to current
2007-11-01	Merge branch 'kh/commit'	blob \| diff \| raw
2007-10-31	Merge branch 'maint' to catch up with 1.5.3.5	blob \| diff \| raw
2007-10-31	Merge branch 'maint' into HEAD	blob \| diff \| raw
2007-10-29	Merge branch 'maint'	blob \| diff \| raw
2007-10-28	Merge branch 'master' of git://git./gitk/gitk	blob \| diff \| raw
2007-10-27	Merge branch 'maint'	blob \| diff \| raw
2007-10-21	Merge branch 'maint'	blob \| diff \| raw
2007-10-21	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw
2007-10-21	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2007-10-19	Merge branch 'maint'	blob \| diff \| raw
2007-10-19	Merge branch 'maint'	blob \| diff \| raw
2007-10-18	Merge branch 'jc/am-quiet'	blob \| diff \| raw
2007-10-18	Merge branch 'maint'	blob \| diff \| raw
2007-10-18	Merge branch 'lt/diff-rename'	blob \| diff \| raw
2007-10-17	Merge branch 'maint'	blob \| diff \| raw
2007-10-16	Merge branch 'master' into db/fetch-pack	blob \| diff \| raw
2007-10-16	Merge branch 'maint'	blob \| diff \| raw
2007-10-03	Merge branch 'mv/unknown'	blob \| diff \| raw
2007-10-03	Merge branch 'ph/strbuf'	blob \| diff \| raw
2007-10-03	Merge branch 'lh/merge'	blob \| diff \| raw
2007-10-03	Merge branch 'jc/autogc'	blob \| diff \| raw \| diff to current
2007-10-03	Sync with GIT 1.5.3.4	blob \| diff \| raw \| diff to current
2007-10-01	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-09-30	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-09-29	Merge branch 'ss/svnimport'	blob \| diff \| raw \| diff to current
2007-09-29	Merge branch 'sv/svn'	blob \| diff \| raw \| diff to current
2007-09-29	Merge branch 'jb/remote-rm'	blob \| diff \| raw \| diff to current
2007-09-29	Sync with GIT 1.5.3.3	blob \| diff \| raw \| diff to current
2007-09-26	Merge branch 'jc/autogc' into js/rebase-i	blob \| diff \| raw \| diff to current
2007-09-25	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-09-24	Merge branch 'jn/web'	blob \| diff \| raw \| diff to current
2007-09-24	Merge branch 'je/hooks'	blob \| diff \| raw \| diff to current
2007-09-24	Merge branch 'js/apply-build-ancestor'	blob \| diff \| raw \| diff to current
2007-09-24	git-merge: add --ff and --no-ff options	blob \| diff \| raw \| diff to current
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
next