Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅ next
commit
grep
author
committer
pickaxe
?
re
t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
[gitweb.git]
/
t
/
t3304-notes-mixed.sh
2010-02-10
Merge branch 'maint-1.6.5' into maint
blob
|
diff
|
raw
2010-02-10
Merge branch 'gp/maint-cvsserver' into maint
blob
|
diff
|
raw
2010-02-10
Merge branch 'jc/maint-reflog-bad-timestamp' into maint
blob
|
diff
|
raw
2010-02-10
Merge branch 'il/maint-xmallocz' 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 'jc/maint-1.6.1-checkout-m-custom-merge...
blob
|
diff
|
raw
2010-02-09
Merge branch 'maint-1.6.5' into maint
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-01-30
Merge branch 'maint-1.6.5' into maint
blob
|
diff
|
raw
2010-01-29
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2010-01-28
Merge branch 'gp/maint-cvsserver'
blob
|
diff
|
raw
2010-01-27
Merge branch 'jc/maint-reflog-bad-timestamp'
blob
|
diff
|
raw
2010-01-27
Merge branch 'il/maint-colon-address'
blob
|
diff
|
raw
2010-01-27
Merge branch 'il/maint-xmallocz'
blob
|
diff
|
raw
2010-01-27
Merge branch 'jh/maint-config-file-prefix'
blob
|
diff
|
raw
2010-01-24
Merge branch 'maint' of git://git.spearce.org/git-gui...
blob
|
diff
|
raw
2010-01-21
Merge branch 'jc/checkout-merge-base'
blob
|
diff
|
raw
2010-01-21
Merge branch 'ap/merge-backend-opts'
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 'maint-1.6.5' into maint
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 'jm/maint-1.6.5-grep-NUL-terminate' into...
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-13
Merge branch 'jc/checkout-merge-base'
blob
|
diff
|
raw
2010-01-13
Merge branch 'nd/sparse'
blob
|
diff
|
raw
2010-01-12
Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc...
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 '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 'fc/opt-quiet-gc-reset'
blob
|
diff
|
raw
2010-01-10
Merge branch 'maint-1.6.2' into maint
blob
|
diff
|
raw
2010-01-07
Merge branch 'js/filter-branch-prime'
blob
|
diff
|
raw
2010-01-07
Merge branch 'sb/maint-octopus'
blob
|
diff
|
raw
2010-01-07
Merge branch 'bg/maint-add-all-doc'
blob
|
diff
|
raw
2010-01-07
Merge branch 'mv/commit-date'
blob
|
diff
|
raw
2010-01-07
Merge branch 'mo/bin-wrappers'
blob
|
diff
|
raw
2009-12-31
Merge branch 'maint-1.6.0' into maint
blob
|
diff
|
raw
2009-12-30
Merge branch 'maint-1.6.1' into maint
blob
|
diff
|
raw
2009-12-28
Merge branch 'jk/1.7.0-status'
blob
|
diff
|
raw
2009-12-27
Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
blob
|
diff
|
raw
2009-12-26
Merge branch 'gb/1.7.0-diff-whitespace-only-output'
blob
|
diff
|
raw
2009-12-26
Merge branch 'jc/1.7.0-diff-whitespace-only-status'
blob
|
diff
|
raw
2009-12-26
Merge branch 'jc/1.7.0-push-safety'
blob
|
diff
|
raw
2009-12-26
Merge branch 'jc/1.7.0-send-email-no-thread-default'
blob
|
diff
|
raw
2009-12-26
Merge branch 'sr/vcs-helper'
blob
|
diff
|
raw
2009-12-22
Merge branch 'maint'
blob
|
diff
|
raw
2009-12-20
Merge branch 'maint'
blob
|
diff
|
raw
2009-12-16
Merge branch 'maint' to sync with 1.6.5.7
blob
|
diff
|
raw
2009-12-11
Sync with 1.6.5.6
blob
|
diff
|
raw
2009-12-09
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2009-12-09
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2009-12-09
Merge branch 'maint'
blob
|
diff
|
raw
2009-12-07
Merge branch 'master' into il/vcs-helper
blob
|
diff
|
raw
2009-12-05
Sync with 1.6.5.5
blob
|
diff
|
raw
2009-12-03
Merge branch 'maint'
blob
|
diff
|
raw
2009-12-03
Fix crasher on encountering SHA1-like non-note in notes...
blob
|
diff
|
raw