tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'jk/add-e-doc'
[git.git]
/
Documentation
/
git-merge.txt
2010-11-24
Junio C Hamano
Merge branch 'jk/add-e-doc'
blob
|
commitdiff
|
raw
2010-11-24
Junio C Hamano
Merge branch 'mm/phrase-remote-tracking'
blob
|
commitdiff
|
raw
2010-11-24
Junio C Hamano
Merge branch 'en/and-cascade-tests'
blob
|
commitdiff
|
raw
2010-11-24
Junio C Hamano
Merge branch 'jl/maint-pull-tags-doc' into maint
blob
|
commitdiff
|
raw
2010-11-24
Junio C Hamano
Merge branch 'kb/maint-diff-ws-check' into maint
blob
|
commitdiff
|
raw
2010-11-24
Junio C Hamano
Merge branch 'jm/mailmap' into maint
blob
|
commitdiff
|
raw
2010-11-24
Junio C Hamano
Merge branch 'tr/maint-git-repack-tmpfile' into maint
blob
|
commitdiff
|
raw
2010-11-24
Junio C Hamano
Merge branch 'jk/maint-apply-no-binary' into maint
blob
|
commitdiff
|
raw
2010-11-24
Junio C Hamano
Merge branch 'jn/send-pack-error' into maint
blob
|
commitdiff
|
raw
2010-11-24
Junio C Hamano
Merge branch 'ak/submodule-sync' into maint
blob
|
commitdiff
|
raw
2010-11-24
Junio C Hamano
Merge branch 'jk/maint-rev-list-nul' into maint
blob
|
commitdiff
|
raw
2010-11-24
Junio C Hamano
Merge branch 'cb/diff-fname-optim' into maint
blob
|
commitdiff
|
raw
2010-11-24
Junio C Hamano
Merge branch 'jk/no-textconv-symlink' into maint
blob
|
commitdiff
|
raw
2010-11-24
Junio C Hamano
Merge branch 'aw/git-p4-deletion' into maint
blob
|
commitdiff
|
raw
2010-11-24
Junio C Hamano
Merge branch 'kf/post-receive-sample-hook' into maint
blob
|
commitdiff
|
raw
2010-11-24
Junio C Hamano
Merge branch 'jk/repack-reuse-object' into maint
blob
|
commitdiff
|
raw
2010-11-24
Junio C Hamano
Merge branch 'bc/fix-cherry-pick-root' into maint
blob
|
commitdiff
|
raw
2010-11-24
Junio C Hamano
Merge branch 'uk/fix-author-ident-sed-script' into...
blob
|
commitdiff
|
raw
2010-11-24
Junio C Hamano
Merge branch 'ab/makefile-track-cc' into maint
blob
|
commitdiff
|
raw
2010-11-24
Junio C Hamano
Merge branch 'mg/reset-doc' into maint
blob
|
commitdiff
|
raw
2010-11-24
Junio C Hamano
Merge branch 'tr/send-email-refuse-sending-unedited...
blob
|
commitdiff
|
raw
2010-11-24
Junio C Hamano
Merge branch 'ef/mingw-daemon'
blob
|
commitdiff
|
raw
2010-11-17
Junio C Hamano
Merge branch 'jl/maint-pull-tags-doc'
blob
|
commitdiff
|
raw
2010-11-17
Junio C Hamano
Merge branch 'kb/maint-submodule-savearg'
blob
|
commitdiff
|
raw
2010-11-17
Junio C Hamano
Merge branch 'jk/missing-config'
blob
|
commitdiff
|
raw
2010-11-17
Junio C Hamano
Merge branch 'kb/maint-diff-ws-check'
blob
|
commitdiff
|
raw
2010-11-17
Junio C Hamano
Merge branch 'bg/maint-gitweb-test-lib'
blob
|
commitdiff
|
raw
2010-11-17
Junio C Hamano
Merge branch 'jm/mailmap'
blob
|
commitdiff
|
raw
2010-11-17
Junio C Hamano
Merge branch 'tr/maint-git-repack-tmpfile'
blob
|
commitdiff
|
raw
2010-11-17
Junio C Hamano
Merge branch 'jk/maint-apply-no-binary'
blob
|
commitdiff
|
raw
2010-11-17
Junio C Hamano
Merge branch 'jk/push-progress'
blob
|
commitdiff
|
raw
2010-11-17
Junio C Hamano
Merge branch 'tr/maint-merge-file-subdir'
blob
|
commitdiff
|
raw
2010-11-17
Junio C Hamano
Merge branch 'jn/send-pack-error'
blob
|
commitdiff
|
raw
2010-11-17
Junio C Hamano
Merge branch 'mg/make-prove'
blob
|
commitdiff
|
raw
2010-11-17
Junio C Hamano
Merge branch 'kb/completion-checkout'
blob
|
commitdiff
|
raw
2010-11-17
Junio C Hamano
Merge branch 'sg/completion'
blob
|
commitdiff
|
raw
2010-11-17
Junio C Hamano
Merge branch 'sg/bisect'
blob
|
commitdiff
|
raw
2010-11-17
Junio C Hamano
Merge branch 'ak/submodule-sync'
blob
|
commitdiff
|
raw
2010-11-17
Junio C Hamano
Merge branch 'jk/maint-rev-list-nul'
blob
|
commitdiff
|
raw
2010-11-17
Junio C Hamano
Merge branch 'ks/no-textconv-symlink'
blob
|
commitdiff
|
raw
2010-11-17
Junio C Hamano
Merge branch 'jn/gitweb-test'
blob
|
commitdiff
|
raw
2010-11-17
Junio C Hamano
Merge branch 'cb/diff-fname-optim'
blob
|
commitdiff
|
raw
2010-11-17
Junio C Hamano
Merge branch 'jk/no-textconv-symlink'
blob
|
commitdiff
|
raw
2010-11-05
Junio C Hamano
Merge branch 'aw/git-p4-deletion'
blob
|
commitdiff
|
raw
2010-11-05
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2010-11-05
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-10-29
Nathan W. Panike
Fix a formatting error in git-merge.txt
blob
|
commitdiff
|
raw
2010-10-27
Junio C Hamano
Merge branch 'en/tree-walk-optim'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-29
Junio C Hamano
Merge branch 'rr/format-patch-count-without-merges'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-18
Junio C Hamano
Merge branch 'js/ls-files-x-doc'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-15
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2010-09-08
Junio C Hamano
Merge branch 'bc/maint-fetch-url-only'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-08
Junio C Hamano
Merge branch 'en/d-f-conflict-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-06
Junio C Hamano
Merge branch 'xx/trivial' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-09-04
Junio C Hamano
Merge branch 'nd/maint-fix-replace'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-01
Junio C Hamano
Merge branch 'en/rebase-against-rebase-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-08-31
Junio C Hamano
Merge branch 'en/d-f-conflict-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-22
Junio C Hamano
Merge branch 'nd/fix-sparse-checkout'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-22
Junio C Hamano
Merge branch 'en/rebase-against-rebase-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-19
Junio C Hamano
Merge branch 'tr/xsize-bits' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-08-19
Junio C Hamano
Merge branch 'jc/sha1-name-find-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-08-18
Junio C Hamano
Merge branch 'sp/fix-smart-http-deadlock-on-error'...
blob
|
commitdiff
|
raw
|
diff to current
2010-08-18
Junio C Hamano
Merge branch 'tr/xsize-bits'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-13
Junio C Hamano
Merge branch 'jc/sha1-name-find-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-13
Junio C Hamano
Merge branch 'sp/fix-smart-http-deadlock-on-error'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-03
Junio C Hamano
Merge branch 'sv/maint-diff-q-clear-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-08-02
Junio C Hamano
Merge git://repo.or.cz/git-gui into pt/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2010-07-27
Junio C Hamano
Sync with 1.7.0 series
blob
|
commitdiff
|
raw
|
diff to current
2010-07-26
Junio C Hamano
Merge branch 'maint-1.7.0' into maint-1.7.1
blob
|
commitdiff
|
raw
|
diff to current
2010-07-26
Junio C Hamano
Merge branch 'maint-1.6.6' into maint-1.7.0
blob
|
commitdiff
|
raw
|
diff to current
2010-07-26
Junio C Hamano
Merge branch 'maint-1.6.4' into maint-1.6.5
blob
|
commitdiff
|
raw
|
diff to current
2010-07-16
Junio C Hamano
Merge branch 'jc/diff-merge-base-multi'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-15
Junio C Hamano
Merge branch 'jc/diff-merge-base-multi'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-15
Junio C Hamano
Merge branch 'jn/grep-open'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-09
Junio C Hamano
Merge remote branch 'ko/master' into jc/read-tree-cache...
blob
|
commitdiff
|
raw
|
diff to current
2010-07-07
Junio C Hamano
Merge branch 'maint-1.6.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-07-07
Junio C Hamano
Merge branch 'tr/receive-pack-aliased-update-fix' into...
blob
|
commitdiff
|
raw
|
diff to current
2010-06-30
Junio C Hamano
Merge branch 'cc/cherry-pick-stdin'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-30
Junio C Hamano
Merge branch 'jl/status-ignore-submodules'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-30
Junio C Hamano
Merge branch 'jk/url-decode'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-30
Junio C Hamano
Merge branch 'jn/grep-open'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-30
Junio C Hamano
Merge branch 'jp/string-list-api-cleanup'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-30
Junio C Hamano
Merge branch 'tr/rev-list-count'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-30
Junio C Hamano
Merge branch 'as/maint-completion-set-u-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-30
Junio C Hamano
Merge branch 'jl/maint-diff-ignore-submodules'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-28
Junio C Hamano
Merge branch 'tr/send-email-8bit' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-06-28
Junio C Hamano
Merge branch 'pb/maint-perl-errmsg-no-dir' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-06-28
Junio C Hamano
Merge branch 'js/maint-am-rebase-invalid-author' into...
blob
|
commitdiff
|
raw
|
diff to current
2010-06-28
Junio C Hamano
Merge branch 'jc/maint-simpler-common-prefix' into...
blob
|
commitdiff
|
raw
|
diff to current
2010-06-28
Junio C Hamano
Merge branch 'bd/maint-unpack-trees-parawalk-fix' into...
blob
|
commitdiff
|
raw
|
diff to current
2010-06-27
Junio C Hamano
Merge branch 'cp/textconv-cat-file'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-27
Junio C Hamano
Merge branch 'pb/maint-perl-errmsg-no-dir'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-27
Junio C Hamano
Merge branch 'tr/send-email-8bit'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-27
Junio C Hamano
Merge branch 'js/maint-am-rebase-invalid-author'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-27
Junio C Hamano
Merge branch 'ab/blame-textconv'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-27
Junio C Hamano
Merge branch 'jn/show-num-walks'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-23
Junio C Hamano
Merge branch 'jk/url-decode'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-22
Junio C Hamano
Merge branch 'jc/maint-simpler-common-prefix'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-22
Junio C Hamano
Merge branch 'sb/format-patch-signature'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-22
Junio C Hamano
Merge branch 'mg/pretty-magic-space'
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
