Merge branch 'tt/help'
[git] / git-merge.sh
2007-12-02  Junio C HamanoMerge branch 'tt/help'
2007-12-01  Junio C HamanoMerge 1.5.3.7 in
2007-12-01  Junio C HamanoMerge branch 'maint'
2007-11-29  Junio C HamanoMerge branch 'maint'
2007-11-26  Junio C HamanoMerge branch 'maint'
2007-11-25  Junio C HamanoMerge branch 'maint'
2007-11-25  Junio C HamanoMerge branch 'jk/send-pack'
2007-11-25  Junio C HamanoMerge branch 'js/mingw-fallouts'
2007-11-25  Junio C HamanoMerge branch 'mh/rebase-skip-hard'
2007-11-25  Junio C HamanoMerge branch 'cc/bisect'
2007-11-23  Junio C HamanoMerge branch 'maint'
2007-11-23  Junio C HamanoMerge branch 'maint'
2007-11-21  Junio C HamanoMerge git://repo.or.cz/git-gui
2007-11-21  Junio C HamanoMerge branch 'maint'
2007-11-19  Junio C HamanoMerge branch 'maint'
2007-11-19  Junio C HamanoMerge branch 'lt/rev-list-gitlink'
2007-11-19  Junio C HamanoMerge branch 'ds/checkout-upper'
2007-11-19  Junio C HamanoMerge branch 'sh/p4'
2007-11-19  Junio C HamanoMerge branch 'lt/rev-list-interactive'
2007-11-18  Junio C HamanoMerge branch 'ph/diffopts'
2007-11-18  Junio C HamanoMerge branch 'maint' to synchronize with 1.5.3.6
2007-11-18  Junio C HamanoMerge branch 'ph/parseopt-sh'
2007-11-17  Junio C HamanoMerge branch 'maint'
2007-11-14  Junio C HamanoMerge branch 'sp/fetch-fix'
2007-11-14  Junio C HamanoMerge branch 'bs/maint-commit-options'
2007-11-14  Junio C HamanoMerge branch 'rv/maint-index-commit'
2007-11-14  Junio C HamanoMerge branch 'bs/maint-t7005'
2007-11-14  Junio C HamanoMerge branch 'jc/maint-add-sync-stat'
2007-11-14  Junio C HamanoMerge branch 'mh/retag'
2007-11-14  Junio C HamanoMerge branch 'jc/stash-create'
2007-11-14  Junio C HamanoMerge branch 'maint'
2007-11-12  Junio C HamanoMerge branch 'maint'
2007-11-12  Junio C HamanoMerge branch 'sp/maint-plug-traverse-commit-list-leak...
2007-11-11  Junio C HamanoMerge branch 'maint'
2007-11-10  Junio C HamanoMerge branch 'maint'
2007-11-09  Junio C HamanoMerge branch 'maint'
2007-11-08  Junio C HamanoMerge branch 'jc/clean-config'
2007-11-08  Junio C HamanoMerge branch 'ds/maint-deflatebound'
2007-11-08  Junio C HamanoMerge branch 'maint'
2007-11-06  Pierre HabouzitMigrate git-merge.sh to use git-rev-parse --parseopt
2007-11-06  Junio C HamanoMerge branch 'maint'
2007-11-04  Junio C HamanoMerge branch 'maint'
2007-11-02  Junio C HamanoMerge branch 'maint'
2007-11-02  Junio C HamanoMerge branch 'gp/maint-diffdoc'
2007-11-02  Junio C HamanoMerge branch 'maint'
2007-11-01  Junio C HamanoMerge branch 'bk/maint-cvsexportcommit'
2007-11-01  Junio C Hamanogit-merge: no reason to use cpio anymore
2007-11-01  Junio C HamanoMerge branch 'kh/commit'
2007-10-31  Junio C HamanoMerge branch 'maint' to catch up with 1.5.3.5
2007-10-31  Junio C HamanoMerge branch 'maint' into HEAD
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
next