merge-recursive: Avoid doubly merging rename/add conflict contents
[gitweb.git] / templates / hooks--pre-commit.sample
2010-04-11 Merge branch 'jl/maint-submodule-gitfile-awareness'
2010-04-11 Sync with 1.7.0.5
2010-04-11 Merge branch 'rc/maint-reflog-msg-for-forced-branch...
2010-04-10 Merge branch 'mr/gitweb-jsmin'
2010-04-10 Merge branch 'jl/maint-submodule-gitfile-awareness'
2010-04-10 Merge branch 'maint'
2010-04-10 Merge branch 'mg/maint-send-email-lazy-editor' into...
2010-04-10 Merge branch 'rc/maint-reflog-msg-for-forced-branch'
2010-04-09 Merge early parts of jk/cached-textconv
2010-04-09 Merge branch 'maint'
2010-04-07 Merge branch 'mg/notes-reflog'
2010-04-07 Merge branch 'jn/mailinfo-scissors'
2010-04-06 Merge branch 'da/maint-python-startup'
2010-04-06 Merge branch 'ic/bash-completion-rpm'
2010-04-06 Merge branch 'sb/fmt-merge-msg'
2010-04-06 Merge branch 'jc/conflict-marker-size'
2010-04-06 Merge branch 'ef/maint-empty-commit-log'
2010-04-06 Merge branch 'sg/bash-completion'
2010-04-04 Merge branch 'maint'
2010-04-03 Merge branch 'mb/rebase-i-no-ff'
2010-04-03 Merge branch 'sp/maint-http-backend-die-triggers-die...
2010-04-03 Merge branch 'rr/imap-send-unconfuse-from-line'
2010-04-03 Merge branch 'mg/use-default-abbrev-length-in-rev-list'
2010-04-03 Merge branch 'mg/maint-send-email-lazy-editor'
2010-04-03 Merge branch 'rb/maint-python-path'
2010-04-03 Merge branch 'jn/merge-diff3-label'
2010-04-03 Merge branch 'ef/cherry-abbrev'
2010-04-03 Merge branch 'bw/template-tool-buildconfig'
2010-03-31 Merge branch 'jc/maint-refs-dangling' into maint
2010-03-29 Merge branch 'cp/add-u-pathspec' into maint
2010-03-24 Merge branch 'jc/maint-refs-dangling'
2010-03-24 Merge branch 'jc/color-attrs' into maint
2010-03-20 Merge branch 'jc/color-attrs'
2010-03-20 Modernize git calling conventions in hook templates
2010-03-10 Merge branch 'cp/add-u-pathspec'
2010-03-08 Merge branch 'fn/maint-mkdtemp-compat' into maint
2010-03-08 Merge branch 'jk/maint-push-tracking-wo-remote' into...
2010-03-07 Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6
2010-03-07 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint...
2010-03-07 Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6
2010-03-07 Merge branch 'tr/maint-cherry-pick-list' into maint...
2010-03-07 Merge branch 'fn/maint-mkdtemp-compat'
2010-03-07 Merge branch 'jk/maint-push-tracking-wo-remote'
2010-03-05 Merge branch 'tr/maint-cherry-pick-list' into maint
2010-03-05 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint
2010-03-03 Merge branch 'jc/maint-fix-test-perm' into maint
2010-03-02 Merge branch 'tr/maint-cherry-pick-list'
2010-03-02 Merge branch 'gf/maint-sh-setup-nongit-ok'
2010-02-21 Merge branch 'jc/maint-fix-test-perm'
2010-02-19 Merge branch 'jk/maint-rmdir-fix' into maint
2010-02-10 Merge branch 'jh/maint-config-file-prefix' into maint
2010-02-10 Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
2010-02-09 Merge branch 'jc/maint-push-doc-status' into maint
2010-02-08 Merge branch 'jc/maint-imap-config-parse' into maint
2010-02-08 Merge branch 'jc/maint-doc-git-add-example' into maint
2010-02-07 Merge git://repo.or.cz/git-gui v1.7.0-rc2
2010-02-06 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-31 Merge commit 'b319ef7' into jc/maint-fix-test-perm
2010-01-29 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-27 Merge branch 'jh/maint-config-file-prefix'
2010-01-24 Merge branch 'maint' of git://git.spearce.org/git-gui...
2010-01-21 Merge branch 'jc/checkout-merge-base'
2010-01-20 Merge branch 'bg/maint-remote-update-default' into...
2010-01-19 Merge branch 'maint-1.6.4' into maint-1.6.5
2010-01-19 Merge branch 'maint-1.6.3' into maint-1.6.4
2010-01-19 Merge branch 'maint-1.6.2' into maint-1.6.3
2010-01-17 Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
2010-01-13 Merge branch 'jc/checkout-merge-base'
2010-01-13 Merge branch 'nd/sparse'
2010-01-12 Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc...
2010-01-10 Merge branch 'bg/maint-remote-update-default'
2010-01-10 Merge branch 'maint-1.6.2' into maint
2009-12-31 Merge branch 'maint-1.6.0' into maint
2009-12-30 Merge branch 'maint-1.6.1' into maint
2009-12-28 Merge branch 'jk/1.7.0-status'
2009-12-27 Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
2009-12-26 Merge branch 'jc/1.7.0-diff-whitespace-only-status'
2009-12-26 Merge branch 'jc/1.7.0-push-safety'
2009-12-26 Merge branch 'jc/1.7.0-send-email-no-thread-default'
2009-12-26 Merge branch 'sr/vcs-helper'
2009-12-09 Merge git://repo.or.cz/git-gui
2009-12-09 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-12-09 Merge branch 'mm/maint-merge-ff-error-message-fix'...
2009-12-09 Merge branch 'jk/maint-add-p-delete-fix' into maint
2009-12-07 Merge branch 'master' into il/vcs-helper
2009-12-03 Merge branch 'uk/maint-shortlog-encoding' into maint
2009-12-03 Merge branch 'fc/maint-format-patch-pathspec-dashes...
2009-12-03 Merge branch 'ap/maint-merge-strategy-list-fix' into...
2009-12-03 Merge branch 'jc/maint-am-keep' into maint
2009-12-03 Merge branch 'rs/work-around-grep-opt-insanity' into...
2009-12-03 Merge branch 'rj/maint-cygwin-count-objects' into maint
2009-12-03 Merge branch 'mm/maint-hint-failed-merge' into maint
2009-12-03 Merge branch 'th/maint-remote-update-help-string' into...
2009-12-03 Merge branch 'rj/maint-t9700' into maint
2009-12-03 Merge branch 'ls/maint-mailinfo-no-inbody' into maint
2009-12-03 Merge branch 'mo/maint-crlf-doc' into maint
2009-12-03 Merge branch 'th/remote-usage' into maint
2009-12-03 Merge branch 'pb/maint-use-custom-perl' into maint
2009-12-03 Merge branch 'mm/config-pathname-tilde-expand' into...
2009-12-03 Merge branch 'bc/grep-i-F' into maint
next