projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
merge-recursive: mark rename/delete conflict as unmerged
[git]
/
diff.c
2008-12-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-12-22
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2008-12-20
Junio C Hamano
Merge branch 'maint' to sync with GIT 1.6.0.6
blob
|
commitdiff
|
raw
2008-12-20
Junio C Hamano
GIT 1.6.0.6
v1.6.0.6
blob
|
commitdiff
|
raw
|
diff to current
2008-12-18
René Scharfe
Fix type-mismatch compiler warning from diff_populate_f...
blob
|
commitdiff
|
raw
2008-12-18
Junio C Hamano
Merge branch 'lt/readlink'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-18
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-12-17
Linus Torvalds
Make 'prepare_temp_file()' ignore st_size for symlinks
blob
|
commitdiff
|
raw
|
diff to current
2008-12-17
Linus Torvalds
Make 'diff_populate_filespec()' use the new 'strbuf_rea...
blob
|
commitdiff
|
raw
|
diff to current
2008-12-17
Junio C Hamano
GIT 1.5.6.6
v1.5.6.6
blob
|
commitdiff
|
raw
|
diff to current
2008-12-17
Junio C Hamano
GIT 1.5.5.6
v1.5.5.6
blob
|
commitdiff
|
raw
|
diff to current
2008-12-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-10
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-10
Jeff King
diff: respect textconv in rewrite diffs
blob
|
commitdiff
|
raw
|
diff to current
2008-12-10
Jeff King
diff: fix handling of binary rewrite diffs
blob
|
commitdiff
|
raw
|
diff to current
2008-12-08
Jeff King
diff: allow turning on textconv explicitly for plumbing
blob
|
commitdiff
|
raw
|
diff to current
2008-12-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-02
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-12-02
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-12-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-12-01
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-12-01
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-29
Junio C Hamano
Merge branch 'nd/narrow' (early part) into jc/add-i-t-a
blob
|
commitdiff
|
raw
|
diff to current
2008-11-28
Junio C Hamano
Merge branch 'js/mingw-rename-fix'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-28
Junio C Hamano
Merge branch 'ph/send-email'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-28
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-27
Junio C Hamano
Merge branch 'rw/maint-typofix' into rw/typofix
blob
|
commitdiff
|
raw
|
diff to current
2008-11-26
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-26
Junio C Hamano
Merge branch 'mm/maint-sort-config-doc' into mm/sort...
blob
|
commitdiff
|
raw
|
diff to current
2008-11-24
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-16
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-11-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-16
Junio C Hamano
Merge branch 'bc/maint-keep-pack'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-16
Junio C Hamano
Merge branch 'jk/commit-v-strip'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-15
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-14
Junio C Hamano
Merge git://git.bogomips.org/git-svn
blob
|
commitdiff
|
raw
|
diff to current
2008-11-14
Junio C Hamano
Merge git://git.bogomips.org/git-svn
blob
|
commitdiff
|
raw
|
diff to current
2008-11-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge branch 'jn/gitweb-customlinks'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge branch 'gb/gitweb-snapshot-pathinfo'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge branch 'ds/uintmax-config' (early part)
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge branch 'jk/maint-commit-v-strip'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge branch 'np/pack-safer'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge branch 'mk/maint-cg-push'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge branch 'bc/maint-keep-pack'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge branch 'mv/remote-rename'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge branch 'jk/deny-push-to-current'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge branch 'dl/xdiff'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge branch 'lt/decorate'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge branch 'jk/diff-convfilter'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge branch 'jk/diff-convfilter-test-fix'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge branch 'st/tag'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-11-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-12
Junio C Hamano
Merge branch 'jk/maint-commit-v-strip' into jk/commit...
blob
|
commitdiff
|
raw
|
diff to current
2008-11-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-09
Junio C Hamano
Merge branch 'ds/autoconf'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-09
Junio C Hamano
Merge branch 'rs/blame'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-05
Junio C Hamano
Merge branch 'jc/gitweb-fix-cloud-tag'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-05
Junio C Hamano
Merge branch 'mv/maint-branch-m-symref'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-05
Junio C Hamano
Merge branch 'mv/parseopt-checkout-index'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-03
Junio C Hamano
Merge branch 'np/index-pack'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-03
Junio C Hamano
Merge branch 'sh/rebase-i-p'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-03
Junio C Hamano
Merge branch 'ag/blame-encoding'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-03
Junio C Hamano
Merge branch 'gb/gitweb-pathinfo'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-03
Junio C Hamano
Merge branch 'cj/maint-gitpm-fix-maybe-self'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-02
Junio C Hamano
Merge branch 'js/maint-fetch-update-head' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-11-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-02
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-11-02
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-31
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-31
Junio C Hamano
Merge branch 'ar/maint-mksnpath' into ar/mksnpath
blob
|
commitdiff
|
raw
|
diff to current
2008-10-27
Junio C Hamano
Merge branch 'ar/maint-mksnpath' into HEAD
blob
|
commitdiff
|
raw
|
diff to current
2008-10-26
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-26
Jeff King
only textconv regular files
blob
|
commitdiff
|
raw
|
diff to current
2008-10-26
Jeff King
userdiff: require explicitly allowing textconv
blob
|
commitdiff
|
raw
|
diff to current
2008-10-26
Jeff King
refactor userdiff textconv code
blob
|
commitdiff
|
raw
|
diff to current
2008-10-26
Jeff King
diff: add missing static declaration
blob
|
commitdiff
|
raw
|
diff to current
2008-10-25
Brian Downing
Always initialize xpparam_t to 0
blob
|
commitdiff
|
raw
|
diff to current
2008-10-22
Junio C Hamano
Merge branch 'jk/diff-convfilter'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-22
Junio C Hamano
Merge branch 'js/maint-fetch-update-head'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-22
Junio C Hamano
Merge branch 'jc/maint-co-track'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-21
Junio C Hamano
Merge branch 'jc/maint-reset-remove-unmerged-new'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-21
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-21
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-21
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-10-19
Junio C Hamano
Merge branch 'sh/maint-rebase3'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-19
Junio C Hamano
Merge branch 'tr/workflow-doc'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-19
Junio C Hamano
Merge branch 'mv/clonev'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-19
Junio C Hamano
Merge branch 'ae/preservemerge'
blob
|
commitdiff
|
raw
|
diff to current
next
projects / git / history
Junio C Hamano
René Scharfe
Linus Torvalds
Jeff King
Brian Downing