Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
unpack-trees: handle lstat failure for existing file
[gitweb.git]
/
xdiff
/
xmerge.c
2011-01-10
Merge branch 'maint-1.7.2' into maint
blob
|
diff
|
raw
2011-01-10
Merge branch 'maint-1.7.0' into maint-1.7.1
blob
|
diff
|
raw
|
diff to current
2010-12-26
Merge branch 'rs/maint-diff-fd-leak' into maint
blob
|
diff
|
raw
2010-12-15
Git 1.7.3.4
v1.7.3.4
blob
|
diff
|
raw
2010-12-15
Git 1.7.1.4
v1.7.1.4
blob
|
diff
|
raw
|
diff to current
2010-12-15
Git 1.7.0.9
v1.7.0.9
blob
|
diff
|
raw
|
diff to current
2010-12-14
Merge branch 'jk/maint-reflog-bottom' into maint
blob
|
diff
|
raw
2010-12-14
Merge branch 'mz/maint-rebase-stat-config' into maint
blob
|
diff
|
raw
2010-12-09
Merge branch 'np/diff-in-corrupt-repository' into maint
blob
|
diff
|
raw
2010-12-09
Merge branch 'ak/apply-non-git-epoch' into maint
blob
|
diff
|
raw
2010-12-09
Merge branch 'cm/diff-check-at-eol' into maint
blob
|
diff
|
raw
2010-12-09
Merge branch 'tc/smart-http-post-redirect' into maint
blob
|
diff
|
raw
2010-12-09
Merge branch 'ab/require-perl-5.8' into maint
blob
|
diff
|
raw
2010-12-02
Prepare for 1.7.3.3
blob
|
diff
|
raw
2010-12-02
Git 1.7.1.3
v1.7.1.3
blob
|
diff
|
raw
|
diff to current
2010-12-02
Merge branch 'cb/maint-orphan-merge-noclobber' into...
blob
|
diff
|
raw
2010-12-02
Merge branch 'ks/no-textconv-symlink' into maint
blob
|
diff
|
raw
2010-12-02
Merge branch 'bc/fortran-userdiff' into maint
blob
|
diff
|
raw
2010-12-02
Merge branch 'maint-1.7.2' into maint
blob
|
diff
|
raw
2010-12-02
Merge branch 'maint-1.7.0' into maint-1.7.1
blob
|
diff
|
raw
|
diff to current
2010-11-24
Merge branch 'tr/maint-git-repack-tmpfile' into maint
blob
|
diff
|
raw
2010-11-24
Merge branch 'jk/maint-apply-no-binary' into maint
blob
|
diff
|
raw
2010-11-24
Merge branch 'cb/diff-fname-optim' into maint
blob
|
diff
|
raw
2010-11-24
Merge branch 'jk/no-textconv-symlink' into maint
blob
|
diff
|
raw
2010-11-24
Merge branch 'aw/git-p4-deletion' into maint
blob
|
diff
|
raw
2010-11-24
Merge branch 'kf/post-receive-sample-hook' into maint
blob
|
diff
|
raw
2010-11-24
Merge branch 'jk/repack-reuse-object' into maint
blob
|
diff
|
raw
2010-11-24
Merge branch 'bc/fix-cherry-pick-root' into maint
blob
|
diff
|
raw
2010-11-24
Merge branch 'uk/fix-author-ident-sed-script' into...
blob
|
diff
|
raw
2010-11-24
Merge branch 'ab/makefile-track-cc' into maint
blob
|
diff
|
raw
2010-11-24
Merge branch 'mg/reset-doc' into maint
blob
|
diff
|
raw
2010-11-24
Merge branch 'tr/send-email-refuse-sending-unedited...
blob
|
diff
|
raw
2010-10-21
Merge branch 'mg/fix-build-remote-helpers' into maint
blob
|
diff
|
raw
2010-10-06
xdiff: cast arguments for ctype functions to unsigned...
blob
|
diff
|
raw
2010-09-18
Merge branch 'js/ls-files-x-doc'
blob
|
diff
|
raw
|
diff to current
2010-09-15
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2010-09-08
Merge branch 'bc/maint-fetch-url-only'
blob
|
diff
|
raw
|
diff to current
2010-09-08
Merge branch 'en/d-f-conflict-fix'
blob
|
diff
|
raw
|
diff to current
2010-09-06
Merge branch 'xx/trivial' into maint
blob
|
diff
|
raw
|
diff to current
2010-09-04
Merge branch 'nd/maint-fix-replace'
blob
|
diff
|
raw
|
diff to current
2010-09-01
Merge branch 'en/rebase-against-rebase-fix' into maint
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'en/d-f-conflict-fix'
blob
|
diff
|
raw
|
diff to current
2010-08-22
Merge branch 'nd/fix-sparse-checkout'
blob
|
diff
|
raw
|
diff to current
2010-08-22
Merge branch 'en/rebase-against-rebase-fix'
blob
|
diff
|
raw
|
diff to current
2010-08-19
Merge branch 'tr/xsize-bits' into maint
blob
|
diff
|
raw
|
diff to current
2010-08-19
Merge branch 'jc/sha1-name-find-fix' into maint
blob
|
diff
|
raw
|
diff to current
2010-08-18
Merge branch 'sp/fix-smart-http-deadlock-on-error'...
blob
|
diff
|
raw
|
diff to current
2010-08-18
Merge branch 'tr/xsize-bits'
blob
|
diff
|
raw
|
diff to current
2010-08-13
Merge branch 'jc/sha1-name-find-fix'
blob
|
diff
|
raw
|
diff to current
2010-08-13
Merge branch 'sp/fix-smart-http-deadlock-on-error'
blob
|
diff
|
raw
|
diff to current
2010-08-02
Merge git://repo.or.cz/git-gui into pt/git-gui
blob
|
diff
|
raw
|
diff to current
2010-07-27
Sync with 1.7.0 series
blob
|
diff
|
raw
|
diff to current
2010-07-26
Merge branch 'maint-1.7.0' into maint-1.7.1
blob
|
diff
|
raw
|
diff to current
2010-07-26
Merge branch 'maint-1.6.6' into maint-1.7.0
blob
|
diff
|
raw
|
diff to current
2010-07-16
Merge branch 'jc/diff-merge-base-multi'
blob
|
diff
|
raw
|
diff to current
2010-07-15
Merge branch 'jc/diff-merge-base-multi'
blob
|
diff
|
raw
|
diff to current
2010-07-09
Merge remote branch 'ko/master' into jc/read-tree-cache...
blob
|
diff
|
raw
|
diff to current
2010-07-07
Merge branch 'maint-1.6.4' into maint
blob
|
diff
|
raw
|
diff to current
2010-07-07
Merge branch 'tr/receive-pack-aliased-update-fix' into...
blob
|
diff
|
raw
|
diff to current
2010-06-22
Merge branch 'jc/rev-list-ancestry-path'
blob
|
diff
|
raw
|
diff to current
2010-06-22
Merge branch 'tc/commit-abbrev-fix' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-22
Merge branch 'cc/maint-diff-CC-binary' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-22
Merge branch 'tc/merge-m-log' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-22
Merge branch 'pc/remove-warn' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-21
Merge branch 'js/maint-receive-pack-symref-alias'
blob
|
diff
|
raw
|
diff to current
2010-06-21
Merge branch 'eb/core-eol'
blob
|
diff
|
raw
|
diff to current
2010-06-21
Merge branch 'fg/autocrlf'
blob
|
diff
|
raw
|
diff to current
2010-06-21
Merge branch 'tc/commit-abbrev-fix'
blob
|
diff
|
raw
|
diff to current
2010-06-21
Merge branch 'tr/receive-pack-aliased-update-fix'
blob
|
diff
|
raw
|
diff to current
2010-06-21
Merge branch 'js/async-thread'
blob
|
diff
|
raw
|
diff to current
2010-06-21
Merge branch 'gv/portable'
blob
|
diff
|
raw
|
diff to current
2010-06-21
Merge branch 'jn/gitweb-fastcgi'
blob
|
diff
|
raw
|
diff to current
2010-06-21
Merge branch 'bw/diff-metainfo-color' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-21
Merge branch 'cb/assume-unchanged-fix' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-21
Merge branch 'jn/notes-doc' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-21
Merge branch 'rs/diff-no-minimal' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-21
Merge branch 'bg/apply-blank-trailing-context' into...
blob
|
diff
|
raw
|
diff to current
2010-06-18
Merge branch 'cc/maint-diff-CC-binary'
blob
|
diff
|
raw
|
diff to current
2010-06-18
Merge branch 'rc/ls-remote-default'
blob
|
diff
|
raw
|
diff to current
2010-06-18
Merge branch 'hg/id-munging'
blob
|
diff
|
raw
|
diff to current
2010-06-18
Merge branch 'tc/merge-m-log'
blob
|
diff
|
raw
|
diff to current
2010-06-16
Merge branch 'cw/maint-exec-defpath' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-16
Merge branch 'sc/http-late-auth' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-16
Merge branch 'cb/maint-stash-orphaned-file' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-16
Merge branch 'mg/advice-statushints' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-16
Merge branch 'jn/maint-bundle' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-16
Merge branch 'rr/doc-submitting' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-16
Merge branch 'jn/t7006-fixup' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-16
Merge branch 'jn/shortlog' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-16
Merge branch 'np/index-pack-memsave' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-16
Merge branch 'sp/maint-dumb-http-pack-reidx' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-16
Merge branch 'jc/am-3-show-corrupted-patch' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-16
Merge branch 'sp/maint-describe-tiebreak-with-tagger...
blob
|
diff
|
raw
|
diff to current
2010-06-16
Merge branch 'np/malloc-threading' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-16
Merge branch 'bg/send-email-smtpdomain' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-16
Merge branch 'rc/maint-curl-helper' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-16
Merge branch 'hg/maint-attr-fix' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-16
Merge branch 'mh/status-optionally-refresh' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-13
Merge branch 'jn/fsck-ident'
blob
|
diff
|
raw
|
diff to current
2010-06-13
Merge branch 'bw/diff-metainfo-color'
blob
|
diff
|
raw
|
diff to current
next