projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Teach @{-1} to git merge
[git]
/
merge-file.c
2009-02-12
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
2009-02-11
Junio C Hamano
Merge branch 'maint-1.5.6' into maint
blob
|
commitdiff
|
raw
2009-02-11
Junio C Hamano
Merge branch 'js/maint-1.6.0-path-normalize'
blob
|
commitdiff
|
raw
2009-02-10
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
2009-02-06
Junio C Hamano
Merge branch 'js/maint-remote-remove-mirror'
blob
|
commitdiff
|
raw
2009-02-06
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
2009-02-06
Junio C Hamano
Merge branch 'sg/maint-gitdir-in-subdir' into maint
blob
|
commitdiff
|
raw
2009-02-06
Junio C Hamano
Merge branch 'lt/maint-wrap-zlib' into maint
blob
|
commitdiff
|
raw
2009-02-06
Junio C Hamano
Merge branch 'js/maint-all-implies-HEAD' into maint
blob
|
commitdiff
|
raw
2009-02-06
Junio C Hamano
Merge branch 'kc/maint-diff-bwi-fix' into maint
blob
|
commitdiff
|
raw
2009-02-04
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
2009-02-04
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
2009-02-03
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
2009-02-01
Junio C Hamano
Merge branch 'ks/maint-mailinfo-folded'
blob
|
commitdiff
|
raw
2009-02-01
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
2009-01-29
Junio C Hamano
Merge branch 'jc/maint-format-patch-o-relative' into...
blob
|
commitdiff
|
raw
2009-01-29
Junio C Hamano
Merge branch 'bs/maint-rename-populate-filespec' into...
blob
|
commitdiff
|
raw
2009-01-29
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
2009-01-27
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
2009-01-27
Junio C Hamano
Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into...
blob
|
commitdiff
|
raw
2009-01-26
Junio C Hamano
Merge branch 'js/maint-all-implies-HEAD'
blob
|
commitdiff
|
raw
2009-01-24
Junio C Hamano
Merge branch 'cb/maint-unpack-trees-absense' into maint
blob
|
commitdiff
|
raw
2009-01-24
Junio C Hamano
Merge branch 'tr/maint-no-index-fixes' into maint
blob
|
commitdiff
|
raw
2009-01-24
Junio C Hamano
Merge branch 'jc/maint-format-patch' into maint
blob
|
commitdiff
|
raw
2009-01-24
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
2009-01-22
Junio C Hamano
Merge branch 'kc/maint-diff-bwi-fix'
blob
|
commitdiff
|
raw
2009-01-22
Junio C Hamano
Merge branch 'lt/maint-wrap-zlib'
blob
|
commitdiff
|
raw
2009-01-22
Junio C Hamano
Merge branch 'sg/maint-gitdir-in-subdir'
blob
|
commitdiff
|
raw
2009-01-22
Junio C Hamano
Merge branch 'jc/maint-format-patch-o-relative'
blob
|
commitdiff
|
raw
2009-01-21
Junio C Hamano
Merge branch 'bs/maint-rename-populate-filespec'
blob
|
commitdiff
|
raw
2009-01-20
Junio C Hamano
Merge branch 'kc/maint-diff-bwi-fix'
blob
|
commitdiff
|
raw
2009-01-18
Junio C Hamano
Merge branch 'jc/maint-format-patch'
blob
|
commitdiff
|
raw
2009-01-18
Junio C Hamano
Merge branch 'tr/maint-no-index-fixes'
blob
|
commitdiff
|
raw
2009-01-18
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
2009-01-15
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
2009-01-15
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
2009-01-14
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
2009-01-14
Junio C Hamano
Merge branch 'js/bundle-tags'
blob
|
commitdiff
|
raw
2009-01-14
Junio C Hamano
Merge branch 'cb/maint-unpack-trees-absense'
blob
|
commitdiff
|
raw
2009-01-13
Junio C Hamano
Merge branch 'cb/maint-merge-recursive-fix' into maint
blob
|
commitdiff
|
raw
2009-01-13
Junio C Hamano
Merge branch 'ap/maint-apply-modefix' into maint
blob
|
commitdiff
|
raw
2009-01-13
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
2009-01-12
Junio C Hamano
Merge branch 'jc/maint-do-not-switch-to-non-commit...
blob
|
commitdiff
|
raw
2009-01-07
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
2009-01-03
Junio C Hamano
Merge branch 'jc/maint-do-not-switch-to-non-commit'
blob
|
commitdiff
|
raw
2009-01-03
Junio C Hamano
Merge branch 'ap/maint-apply-modefix'
blob
|
commitdiff
|
raw
2008-12-27
Junio C Hamano
Merge branch 'sp/maint-describe-all-tag-warning' into...
blob
|
commitdiff
|
raw
2008-12-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-12-22
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2008-12-20
Junio C Hamano
Merge branch 'maint' to sync with GIT 1.6.0.6
blob
|
commitdiff
|
raw
2008-12-18
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2008-12-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-12-15
Junio C Hamano
Merge branch 'cb/maint-merge-recursive-fix' into cb...
blob
|
commitdiff
|
raw
2008-12-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-12-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-12-10
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-12-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-12-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-12-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-12-02
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2008-12-02
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2008-12-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2008-12-01
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2008-12-01
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-29
Junio C Hamano
Merge branch 'nd/narrow' (early part) into jc/add-i-t-a
blob
|
commitdiff
|
raw
2008-11-28
Junio C Hamano
Merge branch 'js/mingw-rename-fix'
blob
|
commitdiff
|
raw
2008-11-28
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-27
Junio C Hamano
Merge branch 'rw/maint-typofix' into rw/typofix
blob
|
commitdiff
|
raw
2008-11-26
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-26
Junio C Hamano
Merge branch 'mm/maint-sort-config-doc' into mm/sort...
blob
|
commitdiff
|
raw
2008-11-24
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-16
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2008-11-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-16
Junio C Hamano
Merge branch 'bc/maint-keep-pack'
blob
|
commitdiff
|
raw
2008-11-15
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-14
Junio C Hamano
Merge git://git.bogomips.org/git-svn
blob
|
commitdiff
|
raw
2008-11-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge branch 'jn/gitweb-customlinks'
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge branch 'gb/gitweb-snapshot-pathinfo'
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge branch 'ds/uintmax-config' (early part)
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge branch 'jk/maint-commit-v-strip'
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge branch 'np/pack-safer'
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge branch 'mk/maint-cg-push'
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge branch 'bc/maint-keep-pack'
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge branch 'mv/remote-rename'
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge branch 'dl/xdiff'
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge branch 'lt/decorate'
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge branch 'jk/diff-convfilter'
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge branch 'jk/diff-convfilter-test-fix'
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge branch 'st/tag'
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2008-11-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-12
Junio C Hamano
Merge branch 'jk/maint-commit-v-strip' into jk/commit...
blob
|
commitdiff
|
raw
2008-11-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-09
Junio C Hamano
Merge branch 'ds/autoconf'
blob
|
commitdiff
|
raw
2008-11-09
Junio C Hamano
Merge branch 'rs/blame'
blob
|
commitdiff
|
raw
next
projects / git / history
Junio C Hamano