Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git]
/
t
/
t3010-ls-files-killed-modified.sh
2010-08-19
Merge branch 'tr/xsize-bits' into maint
blob
|
diff
|
raw
2010-08-18
Merge branch 'tr/xsize-bits'
blob
|
diff
|
raw
2010-08-02
Merge git://repo.or.cz/git-gui into pt/git-gui
blob
|
diff
|
raw
2010-05-21
Merge branch 'jn/gitweb-our-squelch'
blob
|
diff
|
raw
2010-04-19
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2010-04-11
Merge branch 'rc/maint-reflog-msg-for-forced-branch...
blob
|
diff
|
raw
2010-04-10
Merge branch 'rc/maint-reflog-msg-for-forced-branch'
blob
|
diff
|
raw
2010-03-24
Merge branch 'jc/color-attrs' into maint
blob
|
diff
|
raw
2010-03-20
Merge branch 'jc/color-attrs'
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 '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 '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 '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-19
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
diff
|
raw
2010-01-17
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
blob
|
diff
|
raw
2010-01-10
Merge branch 'maint-1.6.2' into maint
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-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-12-03
Merge branch 'jc/maint-am-keep' into maint
blob
|
diff
|
raw
2009-12-03
Merge branch 'np/maint-sideband-favor-status' into...
blob
|
diff
|
raw
2009-11-30
Merge branch 'jc/maint-am-keep'
blob
|
diff
|
raw
2009-11-18
Merge branch 'np/maint-sideband-favor-status'
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-09-16
Merge branch 'tf/diff-whitespace-incomplete-line' into...
blob
|
diff
|
raw
2009-09-15
Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc...
blob
|
diff
|
raw
2009-09-15
Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
blob
|
diff
|
raw
2009-09-15
Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
blob
|
diff
|
raw
2009-09-15
Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
blob
|
diff
|
raw
2009-09-03
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
diff
|
raw
2009-09-03
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
diff
|
raw
2009-09-01
Merge branch 'tf/diff-whitespace-incomplete-line'
blob
|
diff
|
raw
2009-08-28
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
diff
|
raw
2009-08-21
Merge branch 'jc/maint-merge-recursive-fix' into maint
blob
|
diff
|
raw
2009-08-16
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2009-08-11
Merge branch 'jc/maint-merge-recursive-fix'
blob
|
diff
|
raw
2009-08-08
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
diff
|
raw
2009-07-29
Merge branch 'hv/cvsps-tests'
blob
|
diff
|
raw
2009-07-02
Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'
blob
|
diff
|
raw
2009-06-22
Merge branch 'sb/maint-1.6.0-add-config-fix' into maint
blob
|
diff
|
raw
2009-06-22
Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint
blob
|
diff
|
raw
2009-06-21
Merge branch 'maint-1.6.2' into maint
blob
|
diff
|
raw
2009-06-21
Merge branch 'pb/maint-1.6.2-userdiff-fix'
blob
|
diff
|
raw
2009-06-21
Merge branch 'sb/maint-1.6.0-add-config-fix'
blob
|
diff
|
raw
2009-06-20
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2009-06-14
Merge branch 'maint-1.6.2' into maint
blob
|
diff
|
raw
2009-06-11
Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
blob
|
diff
|
raw
2009-06-02
Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
blob
|
diff
|
raw
2009-06-02
Merge branch 'sb/maint-1.6.2-opt-filename-fix' into...
blob
|
diff
|
raw
2009-05-29
Merge branch 'sb/maint-1.6.2-opt-filename-fix'
blob
|
diff
|
raw
2009-05-26
Merge branch 'js/maint-no-ln-across-libexec-and-bin...
blob
|
diff
|
raw
2009-05-26
Merge branch 'lt/maint-diff-reduce-lstat' into maint
blob
|
diff
|
raw
2009-05-26
Merge branch 'do/maint-merge-recursive-fix' into maint
blob
|
diff
|
raw
2009-05-26
Merge branch 'jk/maint-1.6.0-trace-argv' into maint
blob
|
diff
|
raw
2009-05-25
Merge branch 'master' into sb/opt-filename
blob
|
diff
|
raw
2009-05-24
Merge branch 'maint-1.6.2' into maint
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-23
Merge branch 'lt/maint-diff-reduce-lstat'
blob
|
diff
|
raw
2009-05-23
Merge branch 'do/maint-merge-recursive-fix'
blob
|
diff
|
raw
2009-05-23
Merge branch 'jk/maint-1.6.0-trace-argv'
blob
|
diff
|
raw
2009-05-16
Merge branch 'maint-1.6.2' into maint
blob
|
diff
|
raw
2009-05-12
Merge branch 'maint-1.6.2' into maint
blob
|
diff
|
raw
2009-05-06
Merge branch 'maint'
blob
|
diff
|
raw
2009-05-03
Sync with GIT 1.6.2.5
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-29
Merge branch 'maint'
blob
|
diff
|
raw
2009-04-28
Merge branch 'maint'
blob
|
diff
|
raw
2009-04-25
Merge branch 'maint'
blob
|
diff
|
raw
2009-04-23
Merge branch 'jc/maint-read-tree-multi'
blob
|
diff
|
raw
2009-04-21
Merge branch 'mk/maint-apply-swap'
blob
|
diff
|
raw
2009-04-21
Merge branch 'maint'
blob
|
diff
|
raw
2009-04-20
Merge branch 'mm/maint-add-p-quit'
blob
|
diff
|
raw
2009-04-20
Sync with 1.6.2.4
blob
|
diff
|
raw
2009-04-18
Merge branch 'lt/pack-object-memuse'
blob
|
diff
|
raw
2009-04-18
Merge branch 'maint'
blob
|
diff
|
raw
2009-04-18
Merge branch 'maint'
blob
|
diff
|
raw
2009-04-13
Mark t1301 permission test to depend on POSIXPERM
blob
|
diff
|
raw
2009-04-12
Merge branch 'maint'
blob
|
diff
|
raw
2009-04-09
Merge branch 'maint'
blob
|
diff
|
raw
2009-04-08
Merge branch 'maint'
blob
|
diff
|
raw
2009-04-08
Merge branch 'bs/maint-1.6.0-tree-walk-prefix'
blob
|
diff
|
raw
next