tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Do not expect unlink(2) to fail on a directory.
[git.git]
/
git-merge.sh
2007-07-12
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
2007-06-29
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
2007-06-12
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
2007-06-11
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
2007-05-31
Junio C Hamano
Merge branch 'maint-1.5.1' into maint
blob
|
commitdiff
|
raw
2007-05-29
Junio C Hamano
Merge branch 'maint-1.5.1' into maint
blob
|
commitdiff
|
raw
2007-05-29
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
2007-05-26
Junio C Hamano
Merge branch 'maint-1.5.1' into maint
blob
|
commitdiff
|
raw
2007-05-26
Jeff King
More echo "$user_message" fixes.
blob
|
commitdiff
|
raw
|
diff to current
2007-05-25
Junio C Hamano
Merge branch 'maint-1.5.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2007-05-24
Junio C Hamano
Merge branch 'maint-1.5.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2007-05-23
Junio C Hamano
Merge branch 'maint-1.5.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2007-05-22
Junio C Hamano
Merge branch 'maint-1.5.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2007-05-21
Junio C Hamano
Merge branch 'maint-1.5.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2007-05-20
Junio C Hamano
Merge branch 'maint' to synchronize with 1.5.1.6
blob
|
commitdiff
|
raw
|
diff to current
2007-05-19
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-05-19
Junio C Hamano
Merge 1.5.1.5 in
blob
|
commitdiff
|
raw
|
diff to current
2007-05-18
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-05-17
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-05-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-05-15
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-05-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-05-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-05-10
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-05-10
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-05-10
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-05-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-05-08
Shawn O. Pearce
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-05-07
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-05-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-05-07
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-05-07
Junio C Hamano
Merge git://git2./pub/scm/gitk/gitk into maint
blob
|
commitdiff
|
raw
|
diff to current
2007-05-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-05-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-05-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-05-02
Shawn O. Pearce
Merge branch 'gfi-maint' into gfi-master
blob
|
commitdiff
|
raw
|
diff to current
2007-05-01
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-04-29
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-04-29
Shawn O. Pearce
Merge branch 'gfi-maint' into gfi-master
blob
|
commitdiff
|
raw
|
diff to current
2007-04-27
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-04-26
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-04-25
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-04-24
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-04-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-04-20
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-04-19
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-04-18
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-04-18
Junio C Hamano
Merge branch 'fl/cvsserver'
blob
|
commitdiff
|
raw
|
diff to current
2007-04-18
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-04-18
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-04-18
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-04-18
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-04-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-04-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-04-15
Junio C Hamano
Merge git://git2./pub/scm/gitk/gitk into maint
blob
|
commitdiff
|
raw
|
diff to current
2007-04-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-04-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-04-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-04-10
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-04-09
Junio C Hamano
Merge branch 'jc/push'
blob
|
commitdiff
|
raw
|
diff to current
2007-04-09
Junio C Hamano
Merge branch 'jc/merge-subtree'
blob
|
commitdiff
|
raw
|
diff to current
2007-04-09
Junio C Hamano
Merge branch 'js/fetch-progress'
blob
|
commitdiff
|
raw
|
diff to current
2007-04-07
Junio C Hamano
A new merge stragety 'subtree'.
blob
|
commitdiff
|
raw
|
diff to current
2007-04-04
Junio C Hamano
Merge 1.5.0.7 in
blob
|
commitdiff
|
raw
|
diff to current
2007-03-30
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-03-28
Junio C Hamano
Merge branch 'maint' to synchronize with 1.5.0.6
blob
|
commitdiff
|
raw
|
diff to current
2007-03-26
Junio C Hamano
Merge branch 'jc/fpl'
blob
|
commitdiff
|
raw
|
diff to current
2007-03-25
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-03-25
Junio C Hamano
Merge branch 'js/remote-show-push'
blob
|
commitdiff
|
raw
|
diff to current
2007-03-25
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-03-24
Junio C Hamano
Merge branch 'master' into jc/bisect
blob
|
commitdiff
|
raw
|
diff to current
2007-03-24
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-03-22
Junio C Hamano
Merge git://git2.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-03-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-03-22
Michael S. Tsirkin
git-merge: Put FETCH_HEAD data in merge commit message
blob
|
commitdiff
|
raw
|
diff to current
2007-03-20
Junio C Hamano
Merge git://git2.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-03-19
Junio C Hamano
Merge branch 'fl/cvsserver'
blob
|
commitdiff
|
raw
|
diff to current
2007-03-19
Junio C Hamano
Merge branch 'sp/run-command'
blob
|
commitdiff
|
raw
|
diff to current
2007-03-18
Junio C Hamano
Merge branch 'ar/diff'
blob
|
commitdiff
|
raw
|
diff to current
2007-03-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-03-16
Santi Béjar
git-merge: finish when git-read-tree fails
blob
|
commitdiff
|
raw
|
diff to current
2007-03-14
Junio C Hamano
Merge branch 'jc/repack'
blob
|
commitdiff
|
raw
|
diff to current
2007-03-14
Junio C Hamano
Merge branch 'jc/fetch'
blob
|
commitdiff
|
raw
|
diff to current
2007-03-14
Junio C Hamano
Merge branch 'jb/per-user-exclude'
blob
|
commitdiff
|
raw
|
diff to current
2007-03-14
Junio C Hamano
Merge branch 'pb/branch-track'
blob
|
commitdiff
|
raw
|
diff to current
2007-03-13
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-03-12
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-03-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-03-12
J. Bruce Fields
git-merge: warn when -m provided on a fast forward
blob
|
commitdiff
|
raw
|
diff to current
2007-03-06
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-03-05
Junio C Hamano
Merge branch 'js/fetch-progress' (early part)
blob
|
commitdiff
|
raw
|
diff to current
2007-03-05
Junio C Hamano
Merge branch 'js/symlink'
blob
|
commitdiff
|
raw
|
diff to current
2007-03-04
Junio C Hamano
Merge branch 'js/diff-ni' (early part)
blob
|
commitdiff
|
raw
|
diff to current
2007-03-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-03-03
Junio C Hamano
git-merge: fail correctly when we cannot fast forward.
blob
|
commitdiff
|
raw
|
diff to current
2007-03-02
Junio C Hamano
Merge branch 'js/commit-format'
blob
|
commitdiff
|
raw
|
diff to current
2007-02-28
Junio C Hamano
Merge branch 'js/bundle'
blob
|
commitdiff
|
raw
|
diff to current
2007-02-28
Junio C Hamano
Merge branch 'mc/sendmail'
blob
|
commitdiff
|
raw
|
diff to current
2007-02-27
Junio C Hamano
Merge branch 'np/types' into jc/fetch
blob
|
commitdiff
|
raw
|
diff to current
2007-02-26
Junio C Hamano
Merge branch 'jc/merge-symlink' into maint
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
