Merge branch 'js/blame-parsename'
[gitweb.git] / merge-file.h
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-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-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 'dm/stash-k-i-p'
2011-04-27 Merge branch 'rj/sparse'
2011-04-11 sparse: Fix an "symbol 'merge_file' not decared" warning