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
/
lib-httpd
/
2010-09-06
Merge branch 'xx/trivial' into maint
tree
|
diff
2010-09-04
Merge branch 'nd/maint-fix-replace'
tree
|
diff
2010-08-19
Merge branch 'tr/xsize-bits' into maint
tree
|
diff
2010-08-18
Merge branch 'sp/fix-smart-http-deadlock-on-error'...
tree
|
diff
2010-08-18
Merge branch 'tr/xsize-bits'
tree
|
diff
2010-08-13
Merge branch 'sp/fix-smart-http-deadlock-on-error'
tree
|
diff
2010-08-02
Merge git://repo.or.cz/git-gui into pt/git-gui
tree
|
diff
2010-07-26
Merge branch 'maint-1.6.6' into maint-1.7.0
tree
|
diff
2010-07-26
Merge branch 'maint-1.6.5' into maint-1.6.6
tree
|
diff
2010-07-16
Merge branch 'jc/diff-merge-base-multi'
tree
|
diff
2010-07-15
Merge branch 'jc/diff-merge-base-multi'
tree
|
diff
2010-07-09
Merge remote branch 'ko/master' into jc/read-tree-cache...
tree
|
diff
2010-07-07
Merge branch 'maint-1.6.4' into maint
tree
|
diff
2010-06-16
Merge branch 'jc/am-3-show-corrupted-patch' into maint
tree
|
diff
2010-06-16
Merge branch 'sp/maint-describe-tiebreak-with-tagger...
tree
|
diff
2010-06-16
Merge branch 'hg/maint-attr-fix' into maint
tree
|
diff
2010-05-21
Merge branch 'jn/gitweb-our-squelch'
tree
|
diff
2010-05-21
Merge branch 'jc/am-3-show-corrupted-patch'
tree
|
diff
2010-05-21
Merge branch 'jc/maint-no-reflog-expire-unreach-for...
tree
|
diff
2010-05-21
Merge branch 'sp/maint-describe-tiebreak-with-tagger...
tree
|
diff
2010-05-09
Merge branch 'hg/maint-attr-fix'
tree
|
diff
2010-05-09
Merge branch 'jc/maint-reflog-expire-unreachable'
tree
|
diff
2010-04-23
Merge branch 'jk/maint-diffstat-overflow' into maint
tree
|
diff
2010-04-19
Merge branch 'maint-1.6.6' into maint
tree
|
diff
2010-04-19
Merge branch 'jk/maint-diffstat-overflow'
tree
|
diff
2010-04-19
Merge git://git.kernel.org/pub/scm/gitk/gitk
tree
|
diff
2010-04-11
Merge branch 'rc/maint-reflog-msg-for-forced-branch...
tree
|
diff
2010-04-10
Merge branch 'jc/conflict-marker-size' into maint
tree
|
diff
2010-04-10
Merge branch 'mg/maint-send-email-lazy-editor' into...
tree
|
diff
2010-04-10
Merge branch 'rc/maint-reflog-msg-for-forced-branch'
tree
|
diff
2010-04-06
Merge branch 'jc/conflict-marker-size'
tree
|
diff
2010-04-03
Merge branch 'mg/maint-send-email-lazy-editor'
tree
|
diff
2010-03-31
Merge branch 'jc/maint-refs-dangling' into maint
tree
|
diff
2010-03-29
Merge branch 'cp/add-u-pathspec' into maint
tree
|
diff
2010-03-24
Merge branch 'jc/maint-refs-dangling'
tree
|
diff
2010-03-24
Merge branch 'jc/color-attrs' into maint
tree
|
diff
2010-03-24
Merge branch 'jk/maint-add-ignored-dir' into maint
tree
|
diff
2010-03-22
Merge branch 'maint-1.6.6' into maint
tree
|
diff
2010-03-20
Merge branch 'jk/maint-add-ignored-dir'
tree
|
diff
2010-03-20
Merge branch 'jc/color-attrs'
tree
|
diff
2010-03-10
Merge branch 'cp/add-u-pathspec'
tree
|
diff
2010-03-08
Merge branch 'fn/maint-mkdtemp-compat' into maint
tree
|
diff
2010-03-08
Merge branch 'jk/maint-push-tracking-wo-remote' into...
tree
|
diff
2010-03-08
Merge branch 'jk/maint-add--interactive-delete' into...
tree
|
diff
2010-03-08
Merge branch 'maint-1.6.6' into maint
tree
|
diff
2010-03-07
Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6
tree
|
diff
2010-03-07
Merge branch 'gf/maint-sh-setup-nongit-ok' into maint...
tree
|
diff
2010-03-07
Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6
tree
|
diff
2010-03-07
Merge branch 'tr/maint-cherry-pick-list' into maint...
tree
|
diff
2010-03-07
Merge branch 'cc/maint-bisect-paths' into maint-1.6.6
tree
|
diff
2010-03-07
Merge branch 'fn/maint-mkdtemp-compat'
tree
|
diff
2010-03-07
Merge branch 'jk/maint-push-tracking-wo-remote'
tree
|
diff
2010-03-07
Merge branch 'nd/root-git'
tree
|
diff
2010-03-07
Merge branch 'jk/maint-add--interactive-delete'
tree
|
diff
2010-03-05
Merge branch 'tr/maint-cherry-pick-list' into maint
tree
|
diff
2010-03-05
Merge branch 'rs/optim-text-wrap' into maint
tree
|
diff
2010-03-05
Merge branch 'gf/maint-sh-setup-nongit-ok' into maint
tree
|
diff
2010-03-05
Merge branch 'cc/maint-bisect-paths' into maint
tree
|
diff
2010-03-05
Merge branch 'maint-1.6.6' into maint
tree
|
diff
2010-03-05
Merge branch 'maint-1.6.5' into maint-1.6.6
tree
|
diff
2010-03-03
Merge branch 'hm/maint-imap-send-crlf' into maint
tree
|
diff
2010-03-03
Merge branch 'sp/maint-push-sideband' into maint
tree
|
diff
2010-03-03
Merge branch 'jc/maint-fix-test-perm' into maint
tree
|
diff
2010-03-02
Merge branch 'tr/maint-cherry-pick-list'
tree
|
diff
2010-03-02
Merge branch 'rs/optim-text-wrap'
tree
|
diff
2010-03-02
Merge branch 'gf/maint-sh-setup-nongit-ok'
tree
|
diff
2010-03-01
Merge branch 'cc/maint-bisect-paths'
tree
|
diff
2010-02-26
Merge branch 'maint-1.6.6' into maint
tree
|
diff
2010-02-24
Merge branch 'ml/maint-grep-doc' into maint
tree
|
diff
2010-02-21
Merge branch 'ml/maint-grep-doc'
tree
|
diff
2010-02-21
Merge branch 'hm/maint-imap-send-crlf'
tree
|
diff
2010-02-21
Merge branch 'jc/maint-fix-test-perm'
tree
|
diff
2010-02-19
Merge branch 'jk/maint-rmdir-fix' into maint
tree
|
diff
2010-02-16
Merge branch 'maint-1.6.6' into maint
tree
|
diff
2010-02-16
Merge branch 'maint-1.6.5' into maint-1.6.6
tree
|
diff
2010-02-15
Merge branch 'maint-1.6.6' into maint
tree
|
diff
2010-02-12
Merge branch 'maint'
tree
|
diff
2010-02-12
Merge branch 'maint'
tree
|
diff
2010-02-10
Sync with 1.6.6.2
tree
|
diff
2010-02-10
Merge branch 'maint-1.6.5' into maint
tree
|
diff
2010-02-10
Merge branch 'gp/maint-cvsserver' into maint
tree
|
diff
2010-02-10
Merge branch 'jc/maint-reflog-bad-timestamp' into maint
tree
|
diff
2010-02-10
Merge branch 'il/maint-xmallocz' into maint
tree
|
diff
2010-02-10
Merge branch 'jh/maint-config-file-prefix' into maint
tree
|
diff
2010-02-10
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
tree
|
diff
2010-02-10
Merge branch 'sp/maint-push-sideband' into sp/push...
tree
|
diff
2010-02-09
Merge branch 'maint'
tree
|
diff
2010-02-09
Merge branch 'maint-1.6.5' into maint
tree
|
diff
2010-02-09
Merge branch 'jc/maint-push-doc-status' into maint
tree
|
diff
2010-02-08
Merge branch 'jc/maint-imap-config-parse' into maint
tree
|
diff
2010-02-08
Merge branch 'jc/maint-doc-git-add-example' into maint
tree
|
diff
2010-02-07
Merge git://repo.or.cz/git-gui
v1.7.0-rc2
tree
|
diff
2010-02-07
Merge branch 'maint'
tree
|
diff
2010-02-06
Merge git://git.kernel.org/pub/scm/gitk/gitk
tree
|
diff
2010-02-06
Merge branch 'sp/maint-push-sideband' into sp/push...
tree
|
diff
2010-02-06
Merge branch 'maint'
tree
|
diff
2010-02-01
Merge branch 'sp/maint-fast-import-large-blob' into...
tree
|
diff
2010-01-31
Merge commit 'b319ef7' into jc/maint-fix-test-perm
tree
|
diff
2010-01-30
Merge branch 'maint'
tree
|
diff
2010-01-30
Merge branch 'maint-1.6.5' into maint
tree
|
diff
next