Grammar fix for "git merge" man page
[gitweb.git] / builtin-merge.c
2009-03-26 Merge branch 'maint'
2009-03-26 Merge branch 'db/push-cleanup'
2009-03-26 Merge branch 'jc/maint-1.6.0-blame-s'
2009-03-26 Merge branch 'mg/http-auth'
2009-03-26 Merge branch 'jk/reflog-date'
2009-03-26 Merge branch 'jc/attributes-checkout'
2009-03-26 Merge branch 'js/maint-diff-temp-smudge'
2009-03-26 Merge branch 'js/maint-1.6.0-exec-path-env'
2009-03-26 Merge branch 'bc/maint-1.6.1-branch-deleted-was'
2009-03-26 Merge branch 'fg/push-default'
2009-03-26 Merge branch 'dm/maint-docco'
2009-03-25 Merge branch 'for-junio' of git://repo.or.cz/git/mingw/j6t
2009-03-25 Merge branch 'maint'
2009-03-24 Merge branch 'maint-1.6.1' into maint
2009-03-24 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-03-24 Merge branch 'js/windows-tests'
2009-03-22 Merge branch 'maint'
2009-03-22 Merge branch 'maint-1.6.1' into maint
2009-03-22 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-03-22 Merge branch 'dm/maint-docco'
2009-03-22 Merge branch 'mg/test-installed'
2009-03-22 Sync with maint
2009-03-22 Merge branch 'maint-1.6.1' into maint
2009-03-22 Merge branch 'tr/maint-1.6.0-send-email-irt' into maint
2009-03-22 Merge branch 'mg/maint-submodule-normalize-path' into...
2009-03-22 Merge branch 'jc/maint-1.6.0-read-tree-overlay' into...
2009-03-22 Merge branch 'js/maint-1.6.0-path-normalize' into maint...
2009-03-22 Merge branch 'jc/maint-1.6.0-pack-directory' into maint...
2009-03-20 Merge branch 'maint'
2009-03-20 Merge branch 'mv/parseopt-ls-files'
2009-03-20 Merge branch 'fc/parseopt-config'
2009-03-18 Merge branch 'jc/maint-1.6.0-read-tree-overlay'
2009-03-18 Merge branch 'tr/maint-1.6.0-send-email-irt'
2009-03-18 Merge branch 'kb/checkout-optim'
2009-03-13 Merge branch 'maint-1.6.1' into maint
2009-03-13 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-03-13 Merge branch 'js/maint-1.6.1-remote-remove-mirror'...
2009-03-13 Merge branch 'ks/maint-1.6.0-mailinfo-folded' into...
2009-03-11 Merge branch 'js/maint-send-email' into maint
2009-03-11 Merge branch 'fg/maint-exclude-bq' into maint
2009-03-11 Merge branch 'en/maint-hash-object' into maint
2009-03-11 Merge branch 'mg/maint-submodule-normalize-path'
2009-03-11 Merge branch 'jc/maint-1.6.0-keep-pack'
2009-03-08 Merge branch 'maint-1.6.1' into maint
2009-03-05 Merge branch 'en/maint-hash-object'
2009-03-05 Merge branch 'jc/blame'
2009-03-05 Merge branch 'fc/config-editor'
2009-03-05 Merge branch 'js/send-email'
2009-03-05 Merge branch 'sg/rerere-cleanup'
2009-03-05 Merge branch 'jw/imap-preformatted-html'
2009-03-05 Merge branch 'jw/format-patch-attach'
2009-03-05 Merge branch 'sr/force-rebase'
2009-03-05 Merge branch 'fg/exclude-bq'
2009-03-05 Merge branch 'dm/add-i-edit-abort'
2009-03-05 Merge branch 'tp/completion'
2009-03-05 Merge branch 'js/branch-symref'
2009-03-05 Merge branch 'al/ansi-color'
2009-03-05 Merge branch 'js/valgrind'
2009-03-02 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-03-01 Merge branch 'jc/maint-1.6.0-pack-directory'
2009-02-28 Merge branch 'maint'
2009-02-28 Merge branch 'maint-1.6.0' into maint
2009-02-28 Merge branch 'cc/maint-1.6.0-bisect-fix'
2009-02-27 Merge branch 'cc/maint-1.6.0-bisect-fix'
2009-02-25 Merge branch 'jc/maint-1.6.0-pack-directory'
2009-02-20 Merge branch 'maint'
2009-02-18 Merge branch 'maint'
2009-02-18 Turn the flags in struct dir_struct into a single variable
2009-02-15 Merge branch 'mc/setup-cd-p'
2009-02-15 Merge branch 'ff/submodule-no-fetch'
2009-02-15 Merge branch 'ms/mailmap'
2009-02-15 Merge branch 'jn/gitweb-committag'
2009-02-15 Merge branch 'rc/http-push'
2009-02-15 Merge branch 'js/gc-prune'
2009-02-15 Merge branch 'tr/abbrev-commit-no-ellipses'
2009-02-15 Merge branch 'jc/branch-previous'
2009-02-14 Teach @{-1} to git merge
2009-02-12 Merge branch 'maint'
2009-02-12 Merge branch 'maint-1.6.0' into maint
2009-02-11 Merge branch 'maint'
2009-02-11 Merge branch 'maint-1.5.6' into maint
2009-02-11 Merge branch 'js/maint-1.6.0-path-normalize'
2009-02-11 Merge branch 'maint'
2009-02-10 Merge branch 'maint-1.6.0' into maint
2009-02-09 Merge branch 'maint'
2009-02-07 Merge branch 'tr/add-p-single'
2009-02-07 Merge branch 'js/filter-branch-submodule'
2009-02-07 Merge branch 'maint'
2009-02-06 Merge branch 'js/maint-remote-remove-mirror'
2009-02-06 Merge branch 'js/notes'
2009-02-06 Merge branch 'jc/refuse-push-to-current'
2009-02-06 Merge branch 'rc/http-push'
2009-02-06 Merge branch 'gt/utf8-width'
2009-02-06 Merge branch 'jk/head-symref'
2009-02-06 Merge branch 'cb/mergetool'
2009-02-06 Merge branch 'maint'
2009-02-06 Merge branch 'maint-1.6.0' into maint
2009-02-06 Merge branch 'sg/maint-gitdir-in-subdir' into maint
2009-02-06 Merge branch 'lt/maint-wrap-zlib' into maint
2009-02-06 Merge branch 'js/maint-all-implies-HEAD' into maint
next