Merge branch 'maint'
[git] / git-merge.sh
2007-10-29  Junio C HamanoMerge branch 'maint'
2007-10-28  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk
2007-10-27  Junio C HamanoMerge branch 'maint'
2007-10-21  Shawn O. PearceMerge branch 'maint'
2007-10-21  Shawn O. PearceMerge git://git.kernel.org/pub/scm/gitk/gitk
2007-10-21  Shawn O. PearceMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-10-19  Shawn O. PearceMerge branch 'maint'
2007-10-19  Shawn O. PearceMerge branch 'maint'
2007-10-18  Shawn O. PearceMerge branch 'jc/am-quiet'
2007-10-18  Shawn O. PearceMerge branch 'maint'
2007-10-18  Shawn O. PearceMerge branch 'lt/diff-rename'
2007-10-17  Shawn O. PearceMerge branch 'maint'
2007-10-16  Shawn O. PearceMerge branch 'master' into db/fetch-pack
2007-10-16  Shawn O. PearceMerge branch 'maint'
2007-10-03  Junio C HamanoMerge branch 'mv/unknown'
2007-10-03  Junio C HamanoMerge branch 'ph/strbuf'
2007-10-03  Junio C HamanoMerge branch 'lh/merge'
2007-10-03  Junio C HamanoMerge branch 'jc/autogc'
2007-10-03  Junio C HamanoSync with GIT 1.5.3.4
2007-10-01  Junio C HamanoMerge branch 'maint'
2007-09-30  Junio C HamanoMerge branch 'maint'
2007-09-29  Junio C HamanoMerge branch 'ss/svnimport'
2007-09-29  Junio C HamanoMerge branch 'sv/svn'
2007-09-29  Junio C HamanoMerge branch 'jb/remote-rm'
2007-09-29  Junio C HamanoSync with GIT 1.5.3.3
2007-09-26  Junio C HamanoMerge branch 'jc/autogc' into js/rebase-i
2007-09-25  Junio C HamanoMerge branch 'maint'
2007-09-24  Junio C HamanoMerge branch 'jn/web'
2007-09-24  Junio C HamanoMerge branch 'je/hooks'
2007-09-24  Junio C HamanoMerge branch 'js/apply-build-ancestor'
2007-09-24  Lars Hjemligit-merge: add --ff and --no-ff options
2007-09-24  Lars Hjemligit-merge: add support for --commit and --no-squash
2007-09-24  Lars Hjemligit-merge: add support for branch.<name>.mergeoptions
2007-09-24  Lars Hjemligit-merge: refactor option parsing
2007-09-24  Lars Hjemligit-merge: fix faulty SQUASH_MSG
2007-09-24  Junio C HamanoMerge branch 'maint'
2007-09-24  Junio C HamanoMerge branch 'maint' of git://linux-nfs.org/~bfields...
2007-09-23  David KastrupSupplant the "while case ... break ;; esac" idiom
2007-09-19  Josh EnglandAdd post-merge hook, related documentation, and tests.
2007-09-18  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-09-06  Junio C HamanoInvoke "git gc --auto" from commit, merge, am and rebase.
2007-09-01  Junio C HamanoMerge branch 'jp/send-email-cc'
2007-08-29  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk
2007-08-28  Junio C Hamanogit-merge: do up-to-date check also for all strategies
2007-08-27  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-08-26  J. Bruce FieldsMerge branch 'maint'
2007-08-21  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk
2007-08-19  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-08-19  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk
2007-08-16  Junio C HamanoMerge branch 'maint' to sync with 1.5.2.5
2007-08-13  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk
2007-08-06  Junio C HamanoMerge branch 'maint'
2007-08-05  J. Bruce FieldsMerge branch 'maint'
2007-08-01  Junio C HamanoMerge branch 'maint'
2007-07-30  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-07-28  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk
2007-07-19  Junio C HamanoMerge branch 'maint'
2007-07-14  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk
2007-07-12  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk
2007-07-12  Junio C HamanoMerge commit 'git-gui/master'
2007-07-12  Junio C HamanoMerge branch 'maint'
2007-07-12  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-07-10  Shawn O. PearceMerge branch 'maint'
2007-07-09  Junio C HamanoMerge branch 'maint'
2007-07-07  Junio C HamanoMerge branch 'js/stash'
2007-07-07  Junio C HamanoMerge branch 'jc/diff-mark'
2007-07-07  Junio C HamanoMerge branch 'maint'
2007-07-07  Johannes SchindelinEnable "git rerere" by the config variable rerere.enabled
2007-07-04  Junio C HamanoMerge branch 'maint'
2007-07-03  Junio C HamanoRewrite "git-frotz" to "git frotz"
2007-07-03  Junio C HamanoMerge branch 'maint'
2007-07-03  Junio C HamanoMerge branch 'maint'
2007-07-02  Junio C HamanoMerge 1.5.2.3 in
2007-06-30  Junio C HamanoMerge branch 'maint'
2007-06-29  Junio C HamanoMerge branch 'maint'
2007-06-29  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-06-29  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-06-28  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk
2007-06-27  Junio C HamanoMerge branch 'maint'
2007-06-26  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk into...
2007-06-22  Shawn O. PearceImport branch 'git-p4' of git://repo.or.cz/fast-export
2007-06-16  Junio C HamanoMerge branch 'maint' to sync with GIT 1.5.2.2
2007-06-13  Junio C HamanoMerge branch 'maint'
2007-06-12  Junio C HamanoMerge branch 'maint'
2007-06-12  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-06-12  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-06-11  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-06-11  Junio C HamanoMerge branch 'maint'
2007-06-11  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-06-10  Junio C HamanoMerge branch 'maint'
2007-06-09  Junio C HamanoMerge branch 'maint'
2007-06-09  Junio C HamanoMerge branch 'ar/clone'
2007-06-08  Junio C HamanoMerge branch 'maint'
2007-06-06  Junio C HamanoMerge branch 'sv/objfixes'
2007-06-03  Junio C HamanoMerge branch 'maint' to sync with 1.5.2.1
2007-06-03  Junio C HamanoMerge branches 'lh/submodules' and 'pb/am'
2007-06-02  Junio C HamanoMerge branch 'sp/pack'
2007-06-02  Junio C HamanoMerge branch 'maint'
2007-05-31  Junio C HamanoMerge branch 'maint'
2007-05-31  Junio C HamanoMerge branch 'maint-1.5.1' into maint
next