Merge branch 'sg/completion-cleanup'
[gitweb.git] / builtin / merge.c
2011-05-06 Merge branch 'sg/completion-cleanup'
2011-05-06 Merge branch 'js/blame-parsename'
2011-05-06 Merge branch 'jk/format-patch-quote-special-in-from'
2011-05-06 Merge branch 'nd/struct-pathspec'
2011-05-06 Merge branch 'aw/maint-rebase-i-p-no-ff'
2011-05-06 Merge branch 'mg/alias-expose-prefix'
2011-05-06 Merge branch 'mg/diff-uiconfig-doc'
2011-05-06 Merge branch 'maint'
2011-05-05 Merge branch 'maint'
2011-05-04 Merge branch 'ml/test-readme'
2011-05-04 Merge branch 'ft/gitweb-tar-with-gzip-n'
2011-05-04 Merge branch 'mg/rev-list-count-cherry'
2011-05-04 Merge branch 'ss/doc-svn'
2011-05-04 Merge branch 'jn/format-patch-doc'
2011-05-04 Merge branch 'vr/merge-base-doc'
2011-05-04 Merge branch 'ss/cherry-pick-x-doc'
2011-05-04 Merge branch 'jn/maint-format-patch-doc'
2011-05-04 Merge branch 'jk/format-patch-multiline-header'
2011-05-04 Merge branch 'jm/mergetool-submodules'
2011-05-04 Sync with 1.7.5.1
2011-05-04 Merge branch 'jh/dirstat' into maint
2011-05-04 Merge branch 'sp/maint-clear-postfields' into maint
2011-05-04 Merge branch 'jk/maint-stash-oob' into maint
2011-05-04 Merge branch 'jk/maint-upload-pack-shallow' into maint
2011-05-04 Merge branch 'jc/pack-objects-bigfile' into maint
2011-05-04 Merge branch 'mg/reflog-with-options' into maint
2011-05-04 Merge branch 'ar/clean-rmdir-empty' into maint
2011-05-04 Merge branch 'mg/sha1-path-advise' into maint
2011-05-02 Merge branch 'jk/notes-ui-updates'
2011-05-02 Merge branch 'ab/i18n-fixup'
2011-05-02 Merge branch 'nm/submodule-update-force'
2011-05-02 Merge branch 'jh/notes-add-ui'
2011-05-02 Merge branch 'nd/maint-setup'
2011-05-02 Merge branch 'mz/maint-rename-unmerged'
2011-05-01 Merge branch 'rs/strbuf-setlen-assert'
2011-05-01 Merge branch 'vh/git-svn-doc'
2011-04-29 Merge branch 'maint'
2011-04-29 Merge branch 'mg/x-years-12-months' into maint
2011-04-28 Merge branch 'jc/diff-irreversible-delete'
2011-04-28 Merge branch 'jc/rename-degrade-cc-to-c'
2011-04-28 Merge branch 'mz/rebase'
2011-04-28 Merge branch 'en/merge-recursive'
2011-04-28 Merge branch 'jh/dirstat'
2011-04-28 Merge branch 'sp/maint-clear-postfields'
2011-04-27 Merge branch 'mg/x-years-12-months'
2011-04-27 Merge branch 'cn/format-patch-quiet'
2011-04-27 Merge branch 'ef/maint-strbuf-init'
2011-04-27 Merge branch 'rr/doc-content-type'
2011-04-27 Merge branch 'jc/merge-dash-previous'
2011-04-27 Merge branch 'jk/maint-upload-pack-shallow'
2011-04-27 Merge branch 'jk/maint-stash-oob'
2011-04-27 Merge branch 'jc/pack-objects-bigfile'
2011-04-27 Merge branch 'mh/git-svn-automkdirs'
2011-04-27 Merge branch 'mg/reflog-with-options'
2011-04-27 Merge branch 'ar/clean-rmdir-empty'
2011-04-27 Merge branch 'mg/sha1-path-advise'
2011-04-19 Sync with 1.7.4.5
2011-04-15 Merge v1.7.5-rc2 into jn/format-patch-doc
2011-04-14 Merge branch 'maint'
2011-04-13 Merge branch 'maint'
2011-04-13 Merge branch 'jc/rev-list-options-fix' into maint
2011-04-13 Merge branch 'js/checkout-untracked-symlink' into maint
2011-04-12 i18n: mark merge CHERRY_PICK_HEAD messages for translation
2011-04-12 i18n: mark merge "upstream" messages for translation
2011-04-12 i18n: mark merge "Could not read from" message for...
2011-04-12 Merge branch 'js/checkout-untracked-symlink'
2011-04-12 Merge branch 'nd/init-gitdir'
2011-04-11 Merge git://git.kernel.org/pub/scm/gitk/gitk
2011-04-07 merge: allow "-" as a short-hand for "previous branch"
2011-04-06 Sync with 1.7.4.4
2011-04-06 Merge branch 'mg/rev-list-n-reverse-doc' into maint
2011-04-06 Merge branch 'jk/maint-remote-mirror-safer'
2011-04-06 Merge branch 'mg/doc-revisions-txt'
2011-04-04 Merge branch 'maint'
2011-04-04 Merge branch 'jl/submodule-fetch-on-demand'
2011-04-04 Merge branch 'jc/rev-list-options-fix'
2011-04-04 Merge branch 'nm/maint-conflicted-submodule-entries'
2011-04-03 Merge branch 'maint'
2011-04-03 Merge branch 'jc/index-update-if-able' into maint
2011-04-03 Merge branch 'lt/default-abbrev' into maint
2011-04-03 Merge branch 'jc/maint-rev-list-culled-boundary' into...
2011-04-03 Merge branch 'mm/maint-log-n-with-diff-filtering' into...
2011-04-03 Merge branch 'jk/format-patch-multiline-header' into...
2011-04-03 Merge branch 'jn/maint-instaweb-plack-fix' into maint
2011-04-03 Merge branch 'lp/config-vername-check' into maint
2011-04-03 Sync with 1.7.4.3
2011-04-02 Merge branch 'nd/init-gitdir'
2011-04-02 Merge branch 'jc/merge-sans-branch'
2011-04-02 Merge branch 'jr/grep-en-config'
2011-04-02 Merge branch 'ab/i18n-st'
2011-04-02 Merge branch 'jk/pull-into-empty'
2011-04-02 Merge branch 'maint'
2011-04-01 Merge branch 'nd/index-doc' into maint
2011-04-01 Merge branch 'pk/stash-apply-status-relative' into...
2011-04-01 Merge branch 'jc/maint-diff-q-filter' into maint
2011-04-01 Merge branch 'js/maint-stash-index-copy' into maint
2011-04-01 Merge branch 'mg/doc-bisect-tweak-worktree' into maint
2011-04-01 Merge branch 'jh/maint-do-not-track-non-branches' into...
2011-04-01 Merge branch 'fk/maint-cvsimport-early-failure' into...
2011-04-01 Merge branch 'jc/maint-apply-report-offset' into maint
next