revert: Eliminate global "commit" variable
[gitweb.git] / xdiff / xmerge.c
2010-12-01 Merge branch 'js/maint-apply-tab-in-indent-fix' into...
2010-11-30 Merge branch 'en/merge-recursive'
2010-11-30 Merge branch 'jc/emfile'
2010-11-30 Merge branch 'np/diff-in-corrupt-repository'
2010-11-30 Merge branch 'cm/diff-check-at-eol'
2010-11-30 Merge branch 'ak/apply-non-git-epoch'
2010-11-30 Merge branch 'tc/smart-http-post-redirect'
2010-11-24 Merge branch 'cb/maint-orphan-merge-noclobber'
2010-11-24 Merge branch 'tr/maint-git-repack-tmpfile' into maint
2010-11-24 Merge branch 'jk/maint-apply-no-binary' into maint
2010-11-24 Merge branch 'cb/diff-fname-optim' into maint
2010-11-24 Merge branch 'jk/no-textconv-symlink' into maint
2010-11-24 Merge branch 'aw/git-p4-deletion' into maint
2010-11-24 Merge branch 'kf/post-receive-sample-hook' into maint
2010-11-24 Merge branch 'jk/repack-reuse-object' into maint
2010-11-24 Merge branch 'bc/fix-cherry-pick-root' into maint
2010-11-24 Merge branch 'uk/fix-author-ident-sed-script' into...
2010-11-24 Merge branch 'ab/makefile-track-cc' into maint
2010-11-24 Merge branch 'mg/reset-doc' into maint
2010-11-24 Merge branch 'tr/send-email-refuse-sending-unedited...
2010-11-17 Merge branch 'tr/maint-git-repack-tmpfile'
2010-11-17 Merge branch 'jk/maint-apply-no-binary'
2010-11-17 Merge branch 'ks/no-textconv-symlink'
2010-11-17 Merge branch 'jn/gitweb-test'
2010-11-17 Merge branch 'cb/diff-fname-optim'
2010-11-17 Merge branch 'jk/no-textconv-symlink'
2010-11-05 Merge branch 'aw/git-p4-deletion'
2010-11-05 Merge branch 'master' of git://repo.or.cz/git-gui
2010-10-27 Merge branch 'ab/send-email-perl'
2010-10-27 Merge branch 'sb/send-email-use-to-from-input'
2010-10-27 Merge branch 'ab/require-perl-5.8'
2010-10-27 Merge branch 'kb/merge-recursive-rename-threshold'
2010-10-27 Merge branch 'jp/send-email-to-cmd'
2010-10-27 Merge branch 'as/daemon-multi-listen'
2010-10-27 Merge branch 'dm/mergetool-vimdiff'
2010-10-27 Merge branch 'kf/post-receive-sample-hook'
2010-10-27 Merge branch 'jf/merge-ignore-ws'
2010-10-27 Merge branch 'ml/completion-zsh'
2010-10-27 Merge branch 'po/sendemail'
2010-10-27 Merge branch 'en/tree-walk-optim'
2010-10-21 Merge branch 'mg/fix-build-remote-helpers' into maint
2010-10-06 Merge branch 'jk/repack-reuse-object'
2010-10-06 Merge branch 'bc/fix-cherry-pick-root'
2010-10-06 Merge branch 'uk/fix-author-ident-sed-script'
2010-10-06 Merge branch 'cw/gitweb-hilite-config'
2010-10-06 Merge branch 'ab/makefile-track-cc'
2010-10-06 Merge branch 'mg/reset-doc'
2010-10-06 Merge branch 'maint'
2010-10-06 xdiff: cast arguments for ctype functions to unsigned...
2010-09-29 Merge branch 'rr/format-patch-count-without-merges'
2010-09-18 Merge branch 'js/ls-files-x-doc'
2010-09-15 Merge git://repo.or.cz/git-gui
2010-09-08 Merge branch 'bc/maint-fetch-url-only'
2010-09-08 Merge branch 'en/d-f-conflict-fix'
2010-09-06 Merge branch 'xx/trivial' into maint
2010-09-04 Merge branch 'nd/maint-fix-replace'
2010-09-01 Merge branch 'en/rebase-against-rebase-fix' into maint
2010-08-31 Merge branch 'en/d-f-conflict-fix'
2010-08-22 Merge branch 'nd/fix-sparse-checkout'
2010-08-22 Merge branch 'en/rebase-against-rebase-fix'
2010-08-19 Merge branch 'tr/xsize-bits' into maint
2010-08-19 Merge branch 'jc/sha1-name-find-fix' into maint
2010-08-18 Merge branch 'sp/fix-smart-http-deadlock-on-error'...
2010-08-18 Merge branch 'tr/xsize-bits'
2010-08-13 Merge branch 'jc/sha1-name-find-fix'
2010-08-13 Merge branch 'sp/fix-smart-http-deadlock-on-error'
2010-08-02 Merge git://repo.or.cz/git-gui into pt/git-gui
2010-07-27 Sync with 1.7.0 series
2010-07-26 Merge branch 'maint-1.7.0' into maint-1.7.1
2010-07-26 Merge branch 'maint-1.6.6' into maint-1.7.0
2010-07-16 Merge branch 'jc/diff-merge-base-multi'
2010-07-15 Merge branch 'jc/diff-merge-base-multi'
2010-07-09 Merge remote branch 'ko/master' into jc/read-tree-cache...
2010-07-07 Merge branch 'maint-1.6.4' into maint
2010-07-07 Merge branch 'tr/receive-pack-aliased-update-fix' into...
2010-06-22 Merge branch 'jc/rev-list-ancestry-path'
2010-06-22 Merge branch 'tc/commit-abbrev-fix' into maint
2010-06-22 Merge branch 'cc/maint-diff-CC-binary' into maint
2010-06-22 Merge branch 'tc/merge-m-log' into maint
2010-06-22 Merge branch 'pc/remove-warn' into maint
2010-06-21 Merge branch 'js/maint-receive-pack-symref-alias'
2010-06-21 Merge branch 'eb/core-eol'
2010-06-21 Merge branch 'fg/autocrlf'
2010-06-21 Merge branch 'tc/commit-abbrev-fix'
2010-06-21 Merge branch 'tr/receive-pack-aliased-update-fix'
2010-06-21 Merge branch 'js/async-thread'
2010-06-21 Merge branch 'gv/portable'
2010-06-21 Merge branch 'jn/gitweb-fastcgi'
2010-06-21 Merge branch 'bw/diff-metainfo-color' into maint
2010-06-21 Merge branch 'cb/assume-unchanged-fix' into maint
2010-06-21 Merge branch 'jn/notes-doc' into maint
2010-06-21 Merge branch 'rs/diff-no-minimal' into maint
2010-06-21 Merge branch 'bg/apply-blank-trailing-context' into...
2010-06-18 Merge branch 'cc/maint-diff-CC-binary'
2010-06-18 Merge branch 'rc/ls-remote-default'
2010-06-18 Merge branch 'hg/id-munging'
2010-06-18 Merge branch 'tc/merge-m-log'
2010-06-16 Merge branch 'cw/maint-exec-defpath' into maint
2010-06-16 Merge branch 'sc/http-late-auth' into maint
2010-06-16 Merge branch 'cb/maint-stash-orphaned-file' into maint
next