Support a --quiet option in the test-suite.
[gitweb.git] / Documentation / git-merge.txt
2007-10-21 Merge branch 'maint'
2007-10-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2007-10-21 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2007-10-19 Merge branch 'maint'
2007-10-19 Merge branch 'maint'
2007-10-18 Merge branch 'jc/am-quiet'
2007-10-18 Merge branch 'maint'
2007-10-18 Merge branch 'lt/diff-rename'
2007-10-17 Merge branch 'maint'
2007-10-16 Merge branch 'master' into db/fetch-pack
2007-10-16 Merge branch 'maint'
2007-10-03 Merge branch 'mv/unknown'
2007-10-03 Merge branch 'ph/strbuf'
2007-10-03 Merge branch 'lh/merge'
2007-10-03 Merge branch 'js/rebase-i'
2007-10-03 Merge branch 'jc/autogc'
2007-09-29 Merge branch 'gr/smtp'
2007-09-29 Merge branch 'ss/svnimport'
2007-09-29 Merge branch 'sv/svn'
2007-09-29 Merge branch 'ml/submodule'
2007-09-29 Merge branch 'jb/remote-rm'
2007-09-29 Merge branch 'jk/diff-rename'
2007-09-29 Sync with GIT 1.5.3.3
2007-09-26 Fix spelling of overridden in documentation
2007-09-24 git-merge: add support for branch.<name>.mergeoptions
2007-09-18 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2007-08-29 Merge branch 'master' of git://git./gitk/gitk
2007-08-27 Merge branch 'master' of git://repo.or.cz/git-gui
2007-08-26 Merge branch 'maint'
2007-08-21 Merge branch 'master' of git://git./gitk/gitk
2007-08-19 Merge branch 'master' of git://repo.or.cz/git-gui
2007-08-19 Merge branch 'master' of git://git./gitk/gitk
2007-08-16 Merge branch 'maint' to sync with 1.5.2.5
2007-08-13 Merge branch 'master' of git://git./gitk/gitk
2007-08-11 Merge branch 'cr/tag'
2007-08-06 Merge branch 'maint'
2007-08-05 Merge branch 'maint'
2007-08-02 Try to be consistent with capitalization in the documen...
2007-08-01 Merge branch 'maint'
2007-07-30 Merge branch 'master' of git://repo.or.cz/git-gui
2007-07-28 Merge branch 'master' of git://git./gitk/gitk
2007-07-19 Merge branch 'maint'
2007-07-15 Merge branch 'master' of git://repo.or.cz/git/fastimport
2007-07-14 Merge branch 'master' of git://git./gitk/gitk
2007-07-13 Update git-merge documentation.
2007-07-12 Merge branch 'master' of git://git./gitk/gitk
2007-07-12 Merge commit 'git-gui/master'
2007-07-12 Merge branch 'maint'
2007-07-12 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2007-07-10 Merge branch 'maint'
2007-07-09 Merge branch 'maint'
2007-07-07 Merge branch 'maint'
2007-07-04 Merge branch 'maint'
2007-07-03 Merge branch 'maint'
2007-07-03 Merge branch 'maint'
2007-07-02 Merge 1.5.2.3 in
2007-07-01 Merge branch 'ml/worktree'
2007-07-01 Merge branch 'ei/worktree+filter'
2007-06-30 Merge branch 'maint'
2007-06-29 Merge branch 'maint'
2007-06-29 Merge branch 'master' of git://repo.or.cz/git-gui
2007-06-29 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2007-06-28 Merge branch 'master' of git://git./gitk/gitk
2007-06-27 Merge branch 'maint'
2007-06-26 Merge branch 'master' of git://git./gitk/gitk into...
2007-06-23 Merge branch 'js/filter'
2007-06-22 Import branch 'git-p4' of git://repo.or.cz/fast-export
2007-06-16 Merge branch 'maint' to sync with GIT 1.5.2.2
2007-06-13 Merge branch 'maint'
2007-06-13 Merge branch 'aw/cvs'
2007-06-13 Merge branch 'ep/cvstag'
2007-06-12 Merge branch 'lh/submodule'
2007-06-12 Merge branch 'maint'
2007-06-12 Merge branch 'master' of git://repo.or.cz/git-gui
2007-06-12 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2007-06-11 Merge branch 'master' of git://repo.or.cz/git-gui
2007-06-11 Merge branch 'maint'
2007-06-11 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2007-06-10 Merge branch 'maint'
2007-06-09 Merge branch 'maint'
2007-06-09 Merge branch 'aj/pack'
2007-06-09 Merge branch 'js/merge'
2007-06-09 Merge branch 'ar/clone'
2007-06-08 Merge branch 'maint'
2007-06-07 War on whitespace
2007-06-06 Merge branch 'sv/objfixes'
2007-06-03 Merge branch 'maint' to sync with 1.5.2.1
2007-06-03 Merge branches 'lh/submodules' and 'pb/am'
2007-06-02 Merge branch 'sp/pack'
2007-06-02 Merge branch 'maint'
2007-05-31 Merge branch 'maint'
2007-05-29 Merge branch 'db/remote'
2007-05-29 Merge branch 'dh/repack' (early part)
2007-05-29 Merge branch 'np/delta'
2007-05-29 Merge branch 'jc/nodelta'
2007-05-29 Merge branch 'ar/verbose'
2007-05-29 Merge branch 'ar/run'
2007-05-29 Merge branch 'ar/mergestat'
2007-05-29 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2007-05-25 Add a configuration option to control diffstat after...
next