Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
tests: document cherry-pick behavior in face of conflicts
[gitweb.git]
/
t
/
t5403-post-checkout-hook.sh
2010-03-20
Merge branch 'jc/color-attrs'
blob
|
diff
|
raw
2010-03-10
Merge branch 'cp/add-u-pathspec'
blob
|
diff
|
raw
2010-03-08
Merge branch 'fn/maint-mkdtemp-compat' into maint
blob
|
diff
|
raw
2010-03-08
Merge branch 'jk/maint-push-tracking-wo-remote' into...
blob
|
diff
|
raw
2010-03-07
Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6
blob
|
diff
|
raw
2010-03-07
Merge branch 'hm/maint-imap-send-crlf' into maint-1.6.6
blob
|
diff
|
raw
2010-03-07
Merge branch 'gf/maint-sh-setup-nongit-ok' into maint...
blob
|
diff
|
raw
2010-03-07
Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6
blob
|
diff
|
raw
2010-03-07
Merge branch 'rs/optim-text-wrap' into maint-1.6.6
blob
|
diff
|
raw
2010-03-07
Merge branch 'tr/maint-cherry-pick-list' into maint...
blob
|
diff
|
raw
2010-03-07
Merge branch 'fn/maint-mkdtemp-compat'
blob
|
diff
|
raw
2010-03-07
Merge branch 'jk/maint-push-tracking-wo-remote'
blob
|
diff
|
raw
2010-03-05
Merge branch 'tr/maint-cherry-pick-list' into maint
blob
|
diff
|
raw
2010-03-05
Merge branch 'rs/optim-text-wrap' into maint
blob
|
diff
|
raw
2010-03-05
Merge branch 'gf/maint-sh-setup-nongit-ok' into maint
blob
|
diff
|
raw
2010-03-03
Merge branch 'hm/maint-imap-send-crlf' into maint
blob
|
diff
|
raw
2010-03-03
Merge branch 'jc/maint-fix-test-perm' into maint
blob
|
diff
|
raw
2010-03-02
Merge branch 'tr/maint-cherry-pick-list'
blob
|
diff
|
raw
2010-03-02
Merge branch 'rs/optim-text-wrap'
blob
|
diff
|
raw
2010-03-02
Merge branch 'gf/maint-sh-setup-nongit-ok'
blob
|
diff
|
raw
2010-02-21
Merge branch 'hm/maint-imap-send-crlf'
blob
|
diff
|
raw
2010-02-21
Merge branch 'jc/maint-fix-test-perm'
blob
|
diff
|
raw
2010-02-19
Merge branch 'jk/maint-rmdir-fix' into maint
blob
|
diff
|
raw
2010-02-10
Merge branch 'jh/maint-config-file-prefix' into maint
blob
|
diff
|
raw
2010-02-10
Merge branch 'nd/include-termios-for-osol' into maint
blob
|
diff
|
raw
2010-02-10
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
blob
|
diff
|
raw
2010-02-10
Merge branch 'rs/maint-archive-match-pathspec' into...
blob
|
diff
|
raw
2010-02-09
Merge branch 'jc/maint-push-doc-status' into maint
blob
|
diff
|
raw
2010-02-08
Merge branch 'jc/maint-imap-config-parse' into maint
blob
|
diff
|
raw
2010-02-08
Merge branch 'jc/maint-doc-git-add-example' into maint
blob
|
diff
|
raw
2010-02-07
Merge git://repo.or.cz/git-gui
v1.7.0-rc2
blob
|
diff
|
raw
2010-02-06
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2010-02-01
Merge branch 'sb/maint-octopus' into maint-1.6.5
blob
|
diff
|
raw
2010-02-01
Merge branch 'bg/maint-add-all-doc' into maint-1.6.5
blob
|
diff
|
raw
2010-01-31
Merge commit 'b319ef7' into jc/maint-fix-test-perm
blob
|
diff
|
raw
|
diff to current
2010-01-29
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2010-01-27
Merge branch 'jh/maint-config-file-prefix'
blob
|
diff
|
raw
2010-01-25
Merge branch 'jc/fix-tree-walk'
blob
|
diff
|
raw
2010-01-24
Merge branch 'maint' of git://git.spearce.org/git-gui...
blob
|
diff
|
raw
2010-01-23
Merge branch 'jc/branch-d'
blob
|
diff
|
raw
2010-01-23
Merge branch 'js/refer-upstream'
blob
|
diff
|
raw
2010-01-21
Merge branch 'jc/checkout-merge-base'
blob
|
diff
|
raw
2010-01-21
Merge branch 'jc/conflict-marker-size'
blob
|
diff
|
raw
2010-01-21
Merge branch 'ag/maint-apply-too-large-p'
blob
|
diff
|
raw
2010-01-21
Merge branch 'ap/merge-backend-opts'
blob
|
diff
|
raw
2010-01-21
Merge branch 'jh/notes' (early part)
blob
|
diff
|
raw
2010-01-20
Merge branch 'rr/core-tutorial'
blob
|
diff
|
raw
2010-01-20
Merge branch 'jc/cache-unmerge'
blob
|
diff
|
raw
2010-01-20
Merge branch 'js/exec-error-report'
blob
|
diff
|
raw
2010-01-20
Merge branch 'jc/grep-lookahead'
blob
|
diff
|
raw
2010-01-20
Merge branch 'jc/maint-strbuf-add-fix-doubling'
blob
|
diff
|
raw
2010-01-20
Merge branch 'mm/conflict-advice'
blob
|
diff
|
raw
2010-01-20
Merge branch 'da/difftool'
blob
|
diff
|
raw
2010-01-20
Merge branch 'mh/rebase-fixup'
blob
|
diff
|
raw
2010-01-20
Merge branch 'ns/rebase-auto-squash'
blob
|
diff
|
raw
2010-01-20
Merge branch 'mh/rebase-fixup' (early part)
blob
|
diff
|
raw
2010-01-20
Merge branch 'jk/warn-author-committer-after-commit'
blob
|
diff
|
raw
2010-01-20
Merge branch 'tr/http-push-ref-status'
blob
|
diff
|
raw
2010-01-20
Merge branch 'sd/cd-p-show-toplevel'
blob
|
diff
|
raw
2010-01-20
Merge branch 'bg/maint-remote-update-default' into...
blob
|
diff
|
raw
2010-01-20
Merge branch 'sb/maint-octopus' into maint
blob
|
diff
|
raw
2010-01-20
Merge branch 'bg/maint-add-all-doc' into maint
blob
|
diff
|
raw
2010-01-20
Merge branch 'jk/maint-1.6.5-reset-hard' into maint...
blob
|
diff
|
raw
2010-01-20
Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule...
blob
|
diff
|
raw
2010-01-20
Merge branch 'dp/maint-1.6.5-fast-import-non-commit...
blob
|
diff
|
raw
2010-01-20
Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into...
blob
|
diff
|
raw
2010-01-19
Merge branch 'maint-1.6.4' into maint-1.6.5
blob
|
diff
|
raw
2010-01-19
Merge branch 'maint-1.6.3' into maint-1.6.4
blob
|
diff
|
raw
2010-01-19
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
diff
|
raw
2010-01-19
Merge branch 'dp/maint-1.6.5-fast-import-non-commit...
blob
|
diff
|
raw
2010-01-19
Merge branch 'jc/rerere'
blob
|
diff
|
raw
2010-01-19
Merge branch 'pc/uninteresting-submodule-disappear...
blob
|
diff
|
raw
2010-01-19
Merge branch 'nd/include-termios-for-osol'
blob
|
diff
|
raw
2010-01-19
Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into...
blob
|
diff
|
raw
2010-01-18
Merge branch 'tc/test-locate-httpd'
blob
|
diff
|
raw
2010-01-18
Merge branch 'jh/commit-status'
blob
|
diff
|
raw
2010-01-17
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
blob
|
diff
|
raw
2010-01-17
Merge branch 'tc/clone-v-progress'
blob
|
diff
|
raw
2010-01-17
Merge branch 'tc/smart-http-restrict'
blob
|
diff
|
raw
2010-01-17
Merge branch 'jk/run-command-use-shell'
blob
|
diff
|
raw
2010-01-17
Merge branch 'sr/gfi-options'
blob
|
diff
|
raw
2010-01-17
Merge branch 'cc/reset-more'
blob
|
diff
|
raw
2010-01-13
Merge branch 'jc/checkout-merge-base'
blob
|
diff
|
raw
2010-01-13
Merge branch 'rs/maint-archive-match-pathspec'
blob
|
diff
|
raw
2010-01-13
Merge branch 'il/vcs-helper'
blob
|
diff
|
raw
2010-01-13
Merge branch 'cc/reset-more'
blob
|
diff
|
raw
2010-01-13
Merge branch 'nd/sparse'
blob
|
diff
|
raw
2010-01-10
Merge branch 'tr/http-updates'
blob
|
diff
|
raw
2010-01-10
Merge branch 'jk/maint-1.6.5-reset-hard'
blob
|
diff
|
raw
2010-01-10
Merge branch 'jk/push-to-delete'
blob
|
diff
|
raw
2010-01-10
Merge branch 'mm/config-path'
blob
|
diff
|
raw
2010-01-10
Merge branch 'pm/cvs-environ'
blob
|
diff
|
raw
2010-01-10
Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule...
blob
|
diff
|
raw
2010-01-10
Merge branch 'bg/maint-remote-update-default'
blob
|
diff
|
raw
2010-01-10
Merge branch 'mm/diag-path-in-treeish'
blob
|
diff
|
raw
2010-01-10
Merge branch 'fc/opt-quiet-gc-reset'
blob
|
diff
|
raw
2010-01-10
Merge branch 'maint-1.6.2' into maint
blob
|
diff
|
raw
2010-01-10
Merge branch 'maint-1.6.1' into maint-1.6.2
blob
|
diff
|
raw
|
diff to current
2010-01-10
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
diff
|
raw
|
diff to current
2010-01-07
Merge branch 'js/filter-branch-prime'
blob
|
diff
|
raw
next