projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
xdl_merge(): fix and simplify conflict handling
[git]
/
.gitignore
2006-12-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-11-29
Junio C Hamano
Merge master.kernel.org:/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2006-11-29
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-11-29
Junio C Hamano
Merge branch 'jc/globfetch'
blob
|
commitdiff
|
raw
2006-11-29
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-11-27
Junio C Hamano
Merge branch 'js/shortlog'
blob
|
commitdiff
|
raw
2006-11-27
Junio C Hamano
Merge branch 'jc/push-delete-ref'
blob
|
commitdiff
|
raw
2006-11-27
Junio C Hamano
Merge branch 'jc/merge'
blob
|
commitdiff
|
raw
2006-11-24
Junio C Hamano
Merge branch 'jc/upload-pack'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-22
Junio C Hamano
remove merge-recursive-old
blob
|
commitdiff
|
raw
2006-11-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-08
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-11-08
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-08
Junio C Hamano
Merge branch 'jc/pickaxe'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-07
Junio C Hamano
Merge branch 'jc/read-tree'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-05
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-05
Junio C Hamano
Merge branch 'lt/push-config'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-05
Junio C Hamano
Merge branch 'pb/web'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-03
Junio C Hamano
Merge branch 'master' into np/index-pack
blob
|
commitdiff
|
raw
|
diff to current
2006-11-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-01
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-01
Junio C Hamano
Merge branch 'rs/cherry'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-01
Junio C Hamano
Merge branch 'lj/refs'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-31
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-27
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-26
Junio C Hamano
Merge branch 'jc/combined'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-26
Junio C Hamano
Merge branch 'jc/combined'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-25
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-25
Junio C Hamano
Merge branch 'aw/cvsimport'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-25
Junio C Hamano
Merge branch 'jc/web'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-25
Junio C Hamano
Merge for-each-ref to sync gitweb fully with 'next'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-23
Junio C Hamano
Merge branch 'np/pack'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-02
Junio C Hamano
Merge branch 'master' into lj/refs
blob
|
commitdiff
|
raw
|
diff to current
2006-10-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-01
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-01
Junio C Hamano
Merge branch 'sb/fetch' into jc/refs-and-fetch
blob
|
commitdiff
|
raw
|
diff to current
2006-10-01
Junio C Hamano
Merge branch 'jc/gitpm'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-01
Junio C Hamano
Merge branch 'jc/diff-stat'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-01
Junio C Hamano
Merge branch 'lt/web'
blob
|
commitdiff
|
raw
|
diff to current
2006-09-28
Junio C Hamano
Merge branch 'jl/virtual'
blob
|
commitdiff
|
raw
|
diff to current
2006-09-28
Junio C Hamano
Merge branch 'master' into lj/refs
blob
|
commitdiff
|
raw
|
diff to current
2006-09-28
Junio C Hamano
Merge branch 'cc/branch-test'
blob
|
commitdiff
|
raw
|
diff to current
2006-09-28
Junio C Hamano
Merge branch 'jc/for-each-ref' into jc/ref-locking
blob
|
commitdiff
|
raw
|
diff to current
2006-09-28
Junio C Hamano
Merge branch 'sp/void'
blob
|
commitdiff
|
raw
|
diff to current
2006-09-28
Junio C Hamano
Merge branch 'jc/whitespace'
blob
|
commitdiff
|
raw
|
diff to current
2006-09-28
Junio C Hamano
Merge branch 'jc/repack'
blob
|
commitdiff
|
raw
|
diff to current
2006-09-28
Junio C Hamano
Merge branch 'jc/deprecate-recursive'
blob
|
commitdiff
|
raw
|
diff to current
2006-09-27
Junio C Hamano
Merge branch 'jc/lt-ref2-with-lt-refs' into jc/ref...
blob
|
commitdiff
|
raw
|
diff to current
2006-09-27
Junio C Hamano
Merge branch 'jc/for-each-ref-with-lt-refs' into jc...
blob
|
commitdiff
|
raw
|
diff to current
2006-09-25
Junio C Hamano
Deprecate merge-recursive.py
blob
|
commitdiff
|
raw
|
diff to current
2006-09-25
Junio C Hamano
Merge branch 'sk/svnimport'
blob
|
commitdiff
|
raw
|
diff to current
2006-09-25
Junio C Hamano
Merge early parts of branch 'np/pack'
blob
|
commitdiff
|
raw
|
diff to current
2006-09-25
Junio C Hamano
Remove upload-tar and make git-tar-tree a thin wrapper...
blob
|
commitdiff
|
raw
|
diff to current
2006-09-25
Junio C Hamano
Merge branch 'jc/filter-commit'
blob
|
commitdiff
|
raw
|
diff to current
2006-09-24
Junio C Hamano
Merge branch 'jl/daemon'
blob
|
commitdiff
|
raw
|
diff to current
2006-09-23
Rene Scharfe
Remove git-zip-tree
blob
|
commitdiff
|
raw
|
diff to current
2006-09-21
Junio C Hamano
Merge branch 'lt/refs' into jc/lt-ref2-with-lt-refs
blob
|
commitdiff
|
raw
|
diff to current
2006-09-21
Junio C Hamano
Merge branch 'lt/refs' into jc/for-each-ref-with-lt...
blob
|
commitdiff
|
raw
|
diff to current
2006-09-18
Jeff King
gitignore: git-show-ref is a generated file.
blob
|
commitdiff
|
raw
|
diff to current
2006-09-18
Jeff King
gitignore: git-pack-refs is a generated file.
blob
|
commitdiff
|
raw
|
diff to current
2006-09-18
Junio C Hamano
Merge branch 'sk/ftp'
blob
|
commitdiff
|
raw
|
diff to current
2006-09-18
Junio C Hamano
Merge part of branch 'jc/upload-pack'
blob
|
commitdiff
|
raw
|
diff to current
2006-09-18
Junio C Hamano
Merge branch 'jc/pack'
blob
|
commitdiff
|
raw
|
diff to current
2006-09-18
Junio C Hamano
Merge branch 'jc/am'
blob
|
commitdiff
|
raw
|
diff to current
2006-09-18
Junio C Hamano
Merge branch 'jk/diff'
blob
|
commitdiff
|
raw
|
diff to current
2006-09-17
Junio C Hamano
Merge branch 'jc/archive'
blob
|
commitdiff
|
raw
|
diff to current
2006-09-16
Junio C Hamano
Add git-for-each-ref: helper for language bindings
blob
|
commitdiff
|
raw
|
diff to current
2006-09-14
Junio C Hamano
Merge branches 'maint' and 'jc/http'
blob
|
commitdiff
|
raw
|
diff to current
2006-09-13
Junio C Hamano
Merge branch 'jc/unpack'
blob
|
commitdiff
|
raw
|
diff to current
2006-09-13
Junio C Hamano
Merge branch 'jc/binary'
blob
|
commitdiff
|
raw
|
diff to current
2006-09-13
Junio C Hamano
Merge branch 'aw/send-pack'
blob
|
commitdiff
|
raw
|
diff to current
2006-09-11
Junio C Hamano
Merge branch 'jc/sideband' into jc/archive
blob
|
commitdiff
|
raw
|
diff to current
2006-09-09
Franck Bui-Huu
Add git-upload-archive
blob
|
commitdiff
|
raw
|
diff to current
2006-09-09
Franck Bui-Huu
Add git-archive
blob
|
commitdiff
|
raw
|
diff to current
2006-09-08
Jeff King
git-commit.sh: convert run_status to a C builtin
blob
|
commitdiff
|
raw
|
diff to current
2006-09-07
Jakub Narebski
autoconf: Add config.cache to .gitignore
blob
|
commitdiff
|
raw
|
diff to current
2006-09-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-08-28
Junio C Hamano
Merge branch 'gl/web'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-28
Rene Scharfe
Add git-zip-tree to .gitignore
blob
|
commitdiff
|
raw
|
diff to current
2006-08-28
Junio C Hamano
Merge branch 'js/c-merge-recursive'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-23
Junio C Hamano
Merge branch 'gl/cleanup' into gl/cleanup-next
blob
|
commitdiff
|
raw
|
diff to current
2006-08-21
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-15
Junio C Hamano
Merge branch 'master' into pb/gitpm
blob
|
commitdiff
|
raw
|
diff to current
2006-08-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
Merge branch 'jc/upload-pack'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
Merge branch 'jc/racy-delay'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
Merge branch 'th/diff-extra'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
Merge branch 'jc/pack-objects'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
Merge branch 'js/read-tree'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
Merge branch 'js/http-mb'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
Merge branch 'js/color-diff'
blob
|
commitdiff
|
raw
|
diff to current
next