tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Set permissions of each new file before "cvs add"ing it.
[git.git]
/
git-merge.sh
2006-12-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-12-03
Junio C Hamano
git-merge: fix confusion between tag and branch
blob
|
commitdiff
|
raw
2006-11-29
Junio C Hamano
Merge master.kernel.org:/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-11-29
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-29
Junio C Hamano
Merge branch 'jc/globfetch'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-29
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-27
Junio C Hamano
Merge branch 'js/shortlog'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-27
Junio C Hamano
Merge branch 'jc/push-delete-ref'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-27
Junio C Hamano
Merge branch 'jc/merge'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-27
Junio C Hamano
git-merge: do not leak rev-parse output used for checki...
blob
|
commitdiff
|
raw
|
diff to current
2006-11-27
Junio C Hamano
git-merge: tighten error checking.
blob
|
commitdiff
|
raw
|
diff to current
2006-11-24
Junio C Hamano
Merge branch 'jc/upload-pack'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-22
Junio C Hamano
merge: allow merging into a yet-to-be-born branch.
blob
|
commitdiff
|
raw
|
diff to current
2006-11-22
Junio C Hamano
git-merge: make it usable as the first class UI
blob
|
commitdiff
|
raw
|
diff to current
2006-11-22
Junio C Hamano
remove merge-recursive-old
blob
|
commitdiff
|
raw
|
diff to current
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 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-05
Junio C Hamano
Merge branch 'maint'
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 '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 'jc/refs-and-fetch'
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 for-each-ref to sync gitweb fully with 'next'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-25
Junio C Hamano
Merge branch 'jc/web-blame'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-25
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-24
Junio C Hamano
Merge branch 'master' into jc/web
blob
|
commitdiff
|
raw
|
diff to current
2006-10-24
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-23
Junio C Hamano
Merge branch 'np/pack'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-23
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-22
Rene Scharfe
git-merge: show usage if run without arguments
blob
|
commitdiff
|
raw
|
diff to current
2006-10-20
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-20
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-19
Junio C Hamano
Merge branch 'mw/pathinfo'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-19
Junio C Hamano
Merge branch 'js/diff'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-19
Junio C Hamano
Merge branch 'jc/send-email'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-19
Junio C Hamano
Merge branch 'jc/grep'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-19
Junio C Hamano
Merge early part of branch 'jc/diff-apply-patch'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-19
Junio C Hamano
Merge branch 'jc/diff-numstat'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-19
Junio C Hamano
Merge branch 'pb/bisect'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-19
Junio C Hamano
Merge branch 'mw/send-email'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-19
Junio C Hamano
Merge branch 'rs/rebase'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-19
Junio C Hamano
Merge branch 'sb/fetch'
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 '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
Santi Béjar
merge and resolve: Output short hashes and .. in "Updat...
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 '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-25
Junio C Hamano
Deprecate merge-recursive.py
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-14
Junio C Hamano
Merge branches 'maint' and 'jc/http'
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
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-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 '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-08
Junio C Hamano
Merge branch 'master' into pb/gitpm
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 'jn/make'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-26
Junio C Hamano
Merge branch 'pb/configure'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-25
Junio C Hamano
Merge branch 'jc/clone-bind-failure'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-25
Junio C Hamano
Merge branch 'jt/format-patch'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-25
Junio C Hamano
Merge branch 'ew/apply'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-25
Junio C Hamano
Merge branch 'jc/read-tree'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-25
Junio C Hamano
Merge branch 'lt/objformat'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-17
Junio C Hamano
Merge branch 'sp/reflog'
v1.4.2-rc1
blob
|
commitdiff
|
raw
|
diff to current
2006-07-14
Junio C Hamano
Merge branch 'lt/unitype' into js/c-merge-recursive
blob
|
commitdiff
|
raw
|
diff to current
2006-07-14
Junio C Hamano
recur vs recursive: help testing without touching too...
blob
|
commitdiff
|
raw
|
diff to current
2006-07-14
Johannes Schindelin
Status update on merge-recursive in C
blob
|
commitdiff
|
raw
|
diff to current
2006-07-11
Shawn Pearce
Log ref changes made by git-merge and git-pull.
blob
|
commitdiff
|
raw
|
diff to current
2006-07-05
Junio C Hamano
Merge branch 'jc/sha1'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-05
Junio C Hamano
Merge branch 'jc/diff-test'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-05
Junio C Hamano
Merge branch 'th/diff'
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
