tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Introduce an unlink(2) wrapper which gives warning if unlink failed
[git.git]
/
merge-recursive.c
2009-04-29
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-04-29
Junio C Hamano
merge-recursive: do not die on a conflicting submodule
blob
|
commitdiff
|
raw
2009-04-29
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-29
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-28
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-28
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-28
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-25
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-25
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-25
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-23
Junio C Hamano
Merge branch 'jc/maint-read-tree-multi'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-21
Junio C Hamano
Merge branch 'mk/maint-apply-swap'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-21
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-20
Junio C Hamano
Merge branch 'mm/maint-add-p-quit'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-20
Junio C Hamano
Sync with 1.6.2.4
blob
|
commitdiff
|
raw
|
diff to current
2009-04-19
Junio C Hamano
Merge branch 'ef/maint-fast-export' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-19
Junio C Hamano
Merge branch 'mm/maint-add-p-quit' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-19
Junio C Hamano
Merge branch 'lt/maint-reflog-expire' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-19
Junio C Hamano
Merge branch 'jc/maint-shared-literally' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'lt/pack-object-memuse'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'js/maint-submodule-checkout' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'cb/maint-merge-recursive-submodule-fix...
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'da/difftool'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-13
Junio C Hamano
Mark t1301 permission test to depend on POSIXPERM
blob
|
commitdiff
|
raw
|
diff to current
2009-04-12
Junio C Hamano
Merge branch 'sb/doc-upstream-branch'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-12
Junio C Hamano
Merge branch 'jk/show-upstream'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-12
Junio C Hamano
Merge branch 'fg/remote-prune'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-12
Junio C Hamano
Merge branch 'cc/sha1-bsearch'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-12
Junio C Hamano
Merge branch 'cc/bisect-filter'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-12
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-12
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'jc/maint-1.6.0-keep-pack' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'bc/maint-1.6.1-branch-deleted-was' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'js/maint-1.6.0-exec-path-env' into maint...
blob
|
commitdiff
|
raw
|
diff to current
2009-04-08
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-08
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-08
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-08
Junio C Hamano
Merge branch 'lt/reflog-expire'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-08
Junio C Hamano
Merge branch 'bs/maint-1.6.0-tree-walk-prefix'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-08
Junio C Hamano
Merge branch 'ms/http-auth'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-08
Junio C Hamano
Merge branch 'js/maint-submodule-checkout'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-08
Junio C Hamano
Merge branch 'cb/maint-merge-recursive-submodule-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-06
Junio C Hamano
Merge branch 'jc/shared-literally'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-05
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-05
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-05
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-05
Clemens Buchacher
simplify output of conflicting merge
blob
|
commitdiff
|
raw
|
diff to current
2009-04-05
Clemens Buchacher
update cache for conflicting submodule entries
blob
|
commitdiff
|
raw
|
diff to current
2009-04-02
Junio C Hamano
Sync with 1.6.2.2
blob
|
commitdiff
|
raw
|
diff to current
2009-04-02
Junio C Hamano
Merge branch 'jc/maint-1.6.0-blame-s' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-02
Junio C Hamano
Merge branch 'js/maint-1.6.0-exec-path-env' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-02
Junio C Hamano
Merge branch 'bc/maint-1.6.1-branch-deleted-was' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-04-02
Junio C Hamano
Merge branch 'tr/maint-1.6.1-doc-format-patch--root...
blob
|
commitdiff
|
raw
|
diff to current
2009-04-02
Junio C Hamano
Merge branch 'tr/maint-1.6.1-doc-format-patch--root'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-02
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-02
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-02
Junio C Hamano
Merge branch 'jc/maint-1.6.0-keep-pack'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-02
Junio C Hamano
Merge branch 'kb/tracking-count-no-merges'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-30
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-30
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-03-30
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-03-30
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-30
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-03-30
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-03-28
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-28
Junio C Hamano
Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-28
Junio C Hamano
Merge branch 'js/remote-improvements'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-28
Junio C Hamano
Merge branch 'jk/clone-post-checkout'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-28
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-03-27
Junio C Hamano
Merge branch 'db/push-cleanup'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-26
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-26
Junio C Hamano
Merge branch 'db/push-cleanup'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-26
Junio C Hamano
Merge branch 'jc/maint-1.6.0-blame-s'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-26
Junio C Hamano
Merge branch 'mg/http-auth'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-26
Junio C Hamano
Merge branch 'jc/attributes-checkout'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-26
Junio C Hamano
Merge branch 'js/maint-diff-temp-smudge'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-26
Junio C Hamano
Merge branch 'js/maint-1.6.0-exec-path-env'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-26
Junio C Hamano
Merge branch 'bc/maint-1.6.1-branch-deleted-was'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-26
Junio C Hamano
Merge branch 'fg/push-default'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-26
Junio C Hamano
Merge branch 'dm/maint-docco'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-25
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-24
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-03-24
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-03-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-22
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
