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
/
t1303-wacky-config.sh
2010-03-08
Merge branch 'jk/maint-push-tracking-wo-remote' into...
blob
|
diff
|
raw
2010-03-07
Merge branch 'gf/maint-sh-setup-nongit-ok' into maint...
blob
|
diff
|
raw
2010-03-07
Merge branch 'tr/maint-cherry-pick-list' into maint...
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 'gf/maint-sh-setup-nongit-ok' into maint
blob
|
diff
|
raw
2010-03-02
Merge branch 'tr/maint-cherry-pick-list'
blob
|
diff
|
raw
2010-03-02
Merge branch 'gf/maint-sh-setup-nongit-ok'
blob
|
diff
|
raw
2010-02-10
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
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-31
Merge commit 'b319ef7' into jc/maint-fix-test-perm
blob
|
diff
|
raw
2010-01-29
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2010-01-24
Merge branch 'maint' of git://git.spearce.org/git-gui...
blob
|
diff
|
raw
2010-01-17
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
blob
|
diff
|
raw
2009-12-27
Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
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-10-27
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2009-09-21
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2009-08-28
Merge branch 'maint-1.5.6' into maint-1.6.0
blob
|
diff
|
raw
2009-08-16
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2009-07-29
Merge branch 'hv/cvsps-tests'
blob
|
diff
|
raw
2009-06-20
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2009-06-11
Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
blob
|
diff
|
raw
2009-05-31
Merge branch 'mw/send-email'
blob
|
diff
|
raw
2009-05-26
Merge branch 'js/maint-no-ln-across-libexec-and-bin...
blob
|
diff
|
raw
2009-05-23
Merge branch 'mg/track'
blob
|
diff
|
raw
2009-05-23
Merge branch 'js/maint-no-ln-across-libexec-and-bin'
blob
|
diff
|
raw
2009-05-18
Merge branch 'js/add-edit'
blob
|
diff
|
raw
2009-05-03
Merge branch 'mm/maint-add-p-quit' into maint
blob
|
diff
|
raw
2009-05-03
Merge branch 'lt/pack-object-memuse' into maint
blob
|
diff
|
raw
2009-05-03
Merge branch 'jc/maint-1.6.0-keep-pack' into maint...
blob
|
diff
|
raw
2009-05-03
Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
blob
|
diff
|
raw
2009-05-03
Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into...
blob
|
diff
|
raw
2009-05-02
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2009-05-01
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2009-04-20
Merge branch 'mm/maint-add-p-quit'
blob
|
diff
|
raw
2009-04-19
Merge branch 'ef/maint-fast-export' into maint
blob
|
diff
|
raw
2009-04-19
Merge branch 'mm/maint-add-p-quit' into maint
blob
|
diff
|
raw
2009-04-19
Merge branch 'lt/maint-reflog-expire' into maint
blob
|
diff
|
raw
2009-04-19
Merge branch 'jc/maint-shared-literally' into maint
blob
|
diff
|
raw
2009-04-18
Merge branch 'lt/bool-on-off'
blob
|
diff
|
raw
2009-04-18
Merge branch 'lt/pack-object-memuse'
blob
|
diff
|
raw
2009-04-18
Merge branch 'nd/archive-attribute'
blob
|
diff
|
raw
2009-04-18
Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into...
blob
|
diff
|
raw
2009-04-18
Merge branch 'js/maint-submodule-checkout' into maint
blob
|
diff
|
raw
2009-04-18
Merge branch 'cb/maint-merge-recursive-submodule-fix...
blob
|
diff
|
raw
2009-04-18
Merge branch 'ac/color-graph'
blob
|
diff
|
raw
2009-04-18
Merge branch 'jk/cobdoc'
blob
|
diff
|
raw
2009-04-18
Merge branch 'mk/apply-swap'
blob
|
diff
|
raw
2009-04-18
Merge branch 'mm/add-p-quit'
blob
|
diff
|
raw
2009-04-18
Merge branch 'eb/upload-archive-from-git-shell'
blob
|
diff
|
raw
2009-04-18
Merge branch 'jc/shared-literally'
blob
|
diff
|
raw
2009-04-18
Merge branch 'ns/am-to-empty'
blob
|
diff
|
raw
2009-04-18
Merge branch 'bw/short-ref-strict'
blob
|
diff
|
raw
2009-04-18
Merge branch 'da/difftool'
blob
|
diff
|
raw
2009-04-18
Merge branch 'maint'
blob
|
diff
|
raw
2009-04-18
Merge branch 'maint-1.6.1' into maint
blob
|
diff
|
raw
2009-04-18
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
diff
|
raw
2009-04-18
Fix buffer overflow in config parser
blob
|
diff
|
raw
2009-04-09
Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
blob
|
diff
|
raw
|
diff to current
2009-04-09
Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1
blob
|
diff
|
raw
|
diff to current
2009-04-02
Merge branch 'jc/maint-1.6.0-blame-s' into maint
blob
|
diff
|
raw
|
diff to current
2009-03-28
Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'
blob
|
diff
|
raw
|
diff to current
2009-03-26
Merge branch 'jc/maint-1.6.0-blame-s'
blob
|
diff
|
raw
|
diff to current
2009-03-22
Merge branch 'jc/maint-1.6.0-read-tree-overlay' into...
blob
|
diff
|
raw
|
diff to current
2009-03-18
Merge branch 'jc/maint-1.6.0-read-tree-overlay'
blob
|
diff
|
raw
|
diff to current
2009-03-02
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2009-02-11
Merge branch 'maint-1.5.6' into maint
blob
|
diff
|
raw
|
diff to current
2009-02-11
Merge branch 'maint-1.5.5' into maint-1.5.6
blob
|
diff
|
raw
|
diff to current
2009-01-24
Merge branch 'cb/maint-unpack-trees-absense' into maint
blob
|
diff
|
raw
|
diff to current
2009-01-14
Merge branch 'cb/maint-unpack-trees-absense'
blob
|
diff
|
raw
|
diff to current
2009-01-13
Merge branch 'ap/maint-apply-modefix' into maint
blob
|
diff
|
raw
|
diff to current
2009-01-07
Merge branch 'maint-1.5.6' into maint-1.6.0
blob
|
diff
|
raw
|
diff to current
2009-01-03
Merge branch 'ap/maint-apply-modefix'
blob
|
diff
|
raw
|
diff to current
2008-12-27
Merge branch 'sp/maint-describe-all-tag-warning' into...
blob
|
diff
|
raw
|
diff to current
2008-12-22
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-12-20
GIT 1.6.0.6
v1.6.0.6
blob
|
diff
|
raw
|
diff to current
2008-12-18
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-12-17
GIT 1.5.6.6
v1.5.6.6
blob
|
diff
|
raw
|
diff to current
2008-12-02
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-12-02
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-12-01
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-12-01
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-11-16
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-11-13
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-11-13
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-11-02
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-11-02
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2008-10-21
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-10-09
Merge branch 'lt/time-reject-fractional-seconds'
blob
|
diff
|
raw
|
diff to current
2008-10-09
Merge branch 'jc/add-ita'
blob
|
diff
|
raw
|
diff to current
2008-09-29
Merge branch 'jc/better-conflict-resolution'
blob
|
diff
|
raw
|
diff to current
2008-09-25
Merge branch 'mv/merge-recursive'
blob
|
diff
|
raw
|
diff to current
2008-09-25
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-09-19
Merge branch 'jc/diff-prefix'
blob
|
diff
|
raw
|
diff to current
2008-09-19
Merge branch 'np/pack'
blob
|
diff
|
raw
|
diff to current
next