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]
/
builtin-init-db.c
2006-11-29
Junio C Hamano
Merge master.kernel.org:/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2006-11-24
Junio C Hamano
Merge branch 'jc/upload-pack'
blob
|
commitdiff
|
raw
2006-11-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-11-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-11-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-11-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-11-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-11-08
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2006-11-08
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-11-08
Junio C Hamano
Merge branch 'jc/pickaxe'
blob
|
commitdiff
|
raw
2006-11-07
Junio C Hamano
Merge branch 'jc/read-tree'
blob
|
commitdiff
|
raw
2006-11-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-11-05
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-11-05
Junio C Hamano
Merge branch 'lt/push-config'
blob
|
commitdiff
|
raw
2006-11-05
Junio C Hamano
Merge branch 'pb/web'
blob
|
commitdiff
|
raw
2006-11-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-11-03
Junio C Hamano
Merge branch 'master' into np/index-pack
blob
|
commitdiff
|
raw
2006-11-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-11-01
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-11-01
Junio C Hamano
Merge branch 'rs/cherry'
blob
|
commitdiff
|
raw
2006-11-01
Junio C Hamano
Merge branch 'lj/refs'
blob
|
commitdiff
|
raw
2006-10-25
Junio C Hamano
Merge branch 'aw/cvsimport'
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-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
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
2006-10-01
Junio C Hamano
Merge branch 'jc/gitpm'
blob
|
commitdiff
|
raw
|
diff to current
2006-09-28
Junio C Hamano
Merge branch 'master' into lj/refs
blob
|
commitdiff
|
raw
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 'jc/repack'
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-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-20
Johannes Schindelin
add receive.denyNonFastforwards config variable
blob
|
commitdiff
|
raw
|
diff to current
2006-09-18
Linus Torvalds
Make ref resolution saner
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-13
Junio C Hamano
Merge branch 'jc/upload-pack'
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 'jn/web'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
Merge branch 'lt/web'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
Merge branch 'jn/conf'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
Merge branch 'ml/pager'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
Merge branch 'master' into js/c-merge-recursive
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
GIT 1.4.2
v1.4.2
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-08-12
Junio C Hamano
Merge branch 'rj/header'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-08
Junio C Hamano
Merge branch 'master' into pb/gitpm
blob
|
commitdiff
|
raw
|
diff to current
2006-08-04
Junio C Hamano
Merge branch 'jc/c99'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-04
Ramsay Allan Jones
Replace some calls to die(usage_str) with usage(usage_str).
blob
|
commitdiff
|
raw
|
diff to current
2006-07-31
Junio C Hamano
Merge branch 'js/read-tree' into js/c-merge-recursive
blob
|
commitdiff
|
raw
|
diff to current
2006-07-30
Junio C Hamano
Merge branch 'lt/web'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-30
Junio C Hamano
Merge branch '__/setup-n-mv'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-29
Junio C Hamano
Merge branch 'lt/setup' into __/setup-n-mv
blob
|
commitdiff
|
raw
|
diff to current
2006-07-29
Linus Torvalds
Call setup_git_directory() much earlier
blob
|
commitdiff
|
raw
|
diff to current
2006-06-22
Junio C Hamano
Merge early parts of branch 'js/diff'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-19
Junio C Hamano
Merge branch 'yl/build'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-19
Junio C Hamano
Merge branch 'jc/shared'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-18
Junio C Hamano
Merge branch 'master' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-18
Junio C Hamano
Merge branch 'yl/build' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-18
Junio C Hamano
Merge branch 'eb/mail' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-18
Junio C Hamano
Merge early part of branch 'jc/fetchupload'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-18
Junio C Hamano
Merge branch 'jc/rw-prefix'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-18
Junio C Hamano
Merge branch 'pe/date'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-18
Junio C Hamano
Merge branch 'js/diff'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-06-10
Junio C Hamano
Merge branch 'master' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-10
Junio C Hamano
Merge git://git.kernel.org/pub/scm/git/gitweb
blob
|
commitdiff
|
raw
|
diff to current
2006-06-10
Junio C Hamano
Merge branch 'jc/shared' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-10
Junio C Hamano
shared repository: optionally allow reading to "others".
blob
|
commitdiff
|
raw
|
diff to current
2006-06-10
Junio C Hamano
shared repository - add a few missing calls to adjust_s...
blob
|
commitdiff
|
raw
|
diff to current
2006-06-09
Junio C Hamano
builtin-init-db: spell the in-program configuration...
blob
|
commitdiff
|
raw
|
diff to current
2006-06-07
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-06-04
Junio C Hamano
Merge branch 'new' of git://git./gitk/gitk into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-05-29
Junio C Hamano
Merge branch 'jc/dirwalk-n-cache-tree' into jc/cache...
blob
|
commitdiff
|
raw
|
diff to current
2006-05-28
Junio C Hamano
Merge branch 'jc/cache-tree' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-05-24
Junio C Hamano
Merge branch 'master' into sp/reflog
blob
|
commitdiff
|
raw
|
diff to current
2006-05-24
Junio C Hamano
Merge branch 'lt/dirwalk'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-23
Junio C Hamano
Merge branch 'sp/reflog' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-05-21
Junio C Hamano
Merge branch 'master' into js/fmt-patch
blob
|
commitdiff
|
raw
|
diff to current
2006-05-20
Junio C Hamano
Merge branch 'lt/dirwalk' into jc/dirwalk-n-cache-tree
blob
|
commitdiff
|
raw
|
diff to current
2006-05-20
Junio C Hamano
Merge branch 'jc/cache-tree' into jc/dirwalk-n-cache...
blob
|
commitdiff
|
raw
|
diff to current
2006-05-20
Junio C Hamano
Merge branch 'master' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-05-20
Junio C Hamano
Merge branch 'js/fetchconfig'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-20
Junio C Hamano
Merge branch 'jc/read-tree-safety'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-19
Junio C Hamano
Merge branch 'jc/apply'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-19
Junio C Hamano
Merge branch 'eb/quilt'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-19
Junio C Hamano
Merge branch 'jc/grep'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-19
Junio C Hamano
Merge branch 'lt/grep'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-19
Junio C Hamano
Merge branch 'ts/doctar'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-19
Timo Hirvonen
Builtin git-init-db
blob
|
commitdiff
|
raw
|
diff to current
projects / git / history
Junio C Hamano
Johannes Schindelin
Linus Torvalds
Ramsay Allan Jones
Timo Hirvonen