tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Allow config file to specify Signed-off-by identity in format-patch.
[git.git]
/
git-merge.sh
2006-07-30
Junio C Hamano
Merge branch 'jn/make'
blob
|
commitdiff
|
raw
2006-07-26
Junio C Hamano
Merge branch 'pb/configure'
blob
|
commitdiff
|
raw
2006-07-25
Junio C Hamano
Merge branch 'jc/clone-bind-failure'
blob
|
commitdiff
|
raw
2006-07-25
Junio C Hamano
Merge branch 'jt/format-patch'
blob
|
commitdiff
|
raw
2006-07-25
Junio C Hamano
Merge branch 'ew/apply'
blob
|
commitdiff
|
raw
2006-07-25
Junio C Hamano
Merge branch 'jc/read-tree'
blob
|
commitdiff
|
raw
2006-07-25
Junio C Hamano
Merge branch 'lt/objformat'
blob
|
commitdiff
|
raw
2006-07-17
Junio C Hamano
Merge branch 'sp/reflog'
v1.4.2-rc1
blob
|
commitdiff
|
raw
2006-07-11
Shawn Pearce
Log ref changes made by git-merge and git-pull.
blob
|
commitdiff
|
raw
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
2006-06-29
Junio C Hamano
Merge branch 'jc/repack'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-29
Junio C Hamano
Merge branch 'js/patch'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-27
Dennis Stosberg
Fix expr usage for FreeBSD
blob
|
commitdiff
|
raw
|
diff to current
2006-06-26
Junio C Hamano
Merge branch 'jc/squash'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-26
Junio C Hamano
Merge branch 'js/diff'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-24
Junio C Hamano
git-merge --squash
blob
|
commitdiff
|
raw
|
diff to current
2006-06-24
Junio C Hamano
Merge branch 'pb/error'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-24
Timo Hirvonen
git-merge: Don't use -p when outputting summary
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-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 git://git.kernel.org/pub/scm/git/gitweb
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-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 'jc/cache-tree' into jc/dirwalk-n-cache...
blob
|
commitdiff
|
raw
|
diff to current
2006-05-20
Junio C Hamano
Merge branch 'js/fetchconfig'
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 part of 'js/fmt-patch' for RFC2822 dates into...
blob
|
commitdiff
|
raw
|
diff to current
2006-05-18
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-17
Junio C Hamano
Merge branch 'jc/apply' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-05-17
Junio C Hamano
Merge branch 'jc/apply'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-17
Junio C Hamano
Merge branch 'jc/gitlink' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-05-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-17
Junio C Hamano
Merge branch 'np/pack'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-16
Junio C Hamano
Merge branch 'np/pack' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-05-16
Junio C Hamano
Merge branch 'se/tag'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-16
Junio C Hamano
Merge branch 'se/rev-parse'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-16
Junio C Hamano
Merge branch 'se/diff'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-16
Junio C Hamano
Merge branch 'jc/diff' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-05-16
Junio C Hamano
Merge branch 'master' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-05-16
Junio C Hamano
Merge branch 'jc/apply' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-05-15
Junio C Hamano
Merge branch 'jc/grep' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-05-15
Junio C Hamano
Merge branch 'ew/send-email' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-05-15
Junio C Hamano
Merge branch 'np/pack' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-05-15
Junio C Hamano
Merge branch 'lt/oneway' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-05-15
Junio C Hamano
Merge branch 'se/tag' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-05-15
Junio C Hamano
Merge branch 'jc/grep' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-05-15
Junio C Hamano
Merge branch 'jc/apply' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-05-15
Junio C Hamano
Merge branch 'lt/oneway' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-05-15
Junio C Hamano
Merge branch 'se/diff' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-05-14
Sean
Convert some "apply --summary" users to "diff --summary".
blob
|
commitdiff
|
raw
|
diff to current
2006-05-03
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-04-24
Junio C Hamano
Merge branch 'sh/daemon'
blob
|
commitdiff
|
raw
|
diff to current
2006-04-24
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-04-21
Junio C Hamano
Merge branch 'master' into jc/fmt-patch
blob
|
commitdiff
|
raw
|
diff to current
2006-04-20
Junio C Hamano
Merge branch 'jc/fmt-patch' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-04-20
Junio C Hamano
Stop carrying Geert's similarity estimator.
blob
|
commitdiff
|
raw
|
diff to current
2006-04-20
Junio C Hamano
Merge branch 'jc/fmt-patch' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-04-19
Junio C Hamano
Merge branch 'jc/unresolve' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-04-19
Junio C Hamano
Merge branch 'lt/xsha1'
blob
|
commitdiff
|
raw
|
diff to current
2006-04-19
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-04-19
Junio C Hamano
git-merge: a bit more readable user guidance.
blob
|
commitdiff
|
raw
|
diff to current
2006-04-17
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-04-07
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-04-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-04-05
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-04-05
Junio C Hamano
Merge branch 'fix'
blob
|
commitdiff
|
raw
|
diff to current
2006-04-04
Junio C Hamano
Merge branch 'lt/fix-sol-pack'
blob
|
commitdiff
|
raw
|
diff to current
2006-04-04
Junio C Hamano
Merge branch 'lt/fix-sol-pack' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-04-02
Junio C Hamano
Merge branch 'lt/fix-sol-pack' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-31
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-03-28
Junio C Hamano
Merge branch ak/svn
blob
|
commitdiff
|
raw
|
diff to current
2006-03-27
Junio C Hamano
Merge branch 'lt/diffgen' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-26
Junio C Hamano
Merge branches 'jc/clone' and 'jc/name'
blob
|
commitdiff
|
raw
|
diff to current
2006-03-26
Junio C Hamano
Merge branch 'jc/merge'
blob
|
commitdiff
|
raw
|
diff to current
2006-03-26
Junio C Hamano
Merge branch 'lt/diffgen' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-26
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-03-26
Junio C Hamano
Merge branch 'ew/email' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-26
Junio C Hamano
Merge branch 'lt/diffgen' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-26
Junio C Hamano
Merge branch 'rs/tar-tree' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-24
Junio C Hamano
Merge branch 'jc/name' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-22
Junio C Hamano
Merge branch 'jc/pull' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-22
Junio C Hamano
Merge branch 'jc/revlist' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-22
Junio C Hamano
Merge branch 'jc/clone' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-21
Junio C Hamano
Merge branch 'jc/clone' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-21
Junio C Hamano
Merge branch 'jc/name' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-21
Junio C Hamano
Merge branch 'jc/name' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-21
Junio C Hamano
Merge branch 'jc/clone' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-20
Junio C Hamano
Merge branch 'jc/merge' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-20
Junio C Hamano
git-merge knows some strategies want to skip trivial...
blob
|
commitdiff
|
raw
|
diff to current
2006-03-15
Junio C Hamano
Merge branch 'lt/diff' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-15
Junio C Hamano
Merge branch 'lt/diff' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-13
Junio C Hamano
Merge branch 'jc/pack'
blob
|
commitdiff
|
raw
|
diff to current
2006-03-13
Junio C Hamano
Merge branch 'jc/fsck'
blob
|
commitdiff
|
raw
|
diff to current
2006-03-13
Junio C Hamano
Merge branch 'jc/diff' into next
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
