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 'cc/bisect'
[git.git]
/
Documentation
/
git-merge.txt
2008-05-25
Junio C Hamano
Merge branch 'ap/svn'
blob
|
commitdiff
|
raw
2008-05-24
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2008-05-23
Junio C Hamano
Merge branch 'pb/push'
blob
|
commitdiff
|
raw
2008-05-23
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-05-21
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-05-21
Junio C Hamano
Merge branch 'sv/first-parent'
blob
|
commitdiff
|
raw
2008-05-21
Junio C Hamano
Merge branch 'np/pack'
blob
|
commitdiff
|
raw
2008-05-21
Junio C Hamano
Merge branch 'as/graph'
blob
|
commitdiff
|
raw
2008-05-21
Junio C Hamano
Merge branch 'jk/maint-send-email-compose'
blob
|
commitdiff
|
raw
2008-05-21
Junio C Hamano
Merge branch 'hb/maint-send-email-quote-recipients'
blob
|
commitdiff
|
raw
2008-05-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-05-15
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2008-05-15
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2008-05-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-05-14
Junio C Hamano
Merge branch 'sb/committer'
blob
|
commitdiff
|
raw
2008-05-14
Junio C Hamano
Merge branch 'bd/tests'
blob
|
commitdiff
|
raw
2008-05-14
Junio C Hamano
Merge branch 'mv/format-cc'
blob
|
commitdiff
|
raw
2008-05-14
Junio C Hamano
Merge branch 'cc/hooks-doc'
blob
|
commitdiff
|
raw
2008-05-12
Junio C Hamano
Merge branch 'gp/bisect-fix'
blob
|
commitdiff
|
raw
2008-05-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-05-11
Junio C Hamano
Merge branch 'py/diff-submodule'
blob
|
commitdiff
|
raw
2008-05-11
Junio C Hamano
Merge branch 'lt/case-insensitive'
blob
|
commitdiff
|
raw
2008-05-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-05-09
Junio C Hamano
Merge branch 'sg/merge-options' (early part)
blob
|
commitdiff
|
raw
2008-05-03
Junio C Hamano
Merge commit 'sg/merge-options^' into jk/renamelimit
blob
|
commitdiff
|
raw
2008-04-13
SZEDER Gábor
merge, pull: introduce '--(no-)stat' option
blob
|
commitdiff
|
raw
2008-04-13
SZEDER Gábor
doc: moved merge.* config variables into separate merge...
blob
|
commitdiff
|
raw
|
diff to current
2008-04-09
Junio C Hamano
Merge branch 'jc/rename'
blob
|
commitdiff
|
raw
|
diff to current
2008-04-08
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-04-05
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-04-02
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-03-16
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-03-15
Junio C Hamano
Merge branch 'py/submodule'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-15
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-03-12
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-03-12
Junio C Hamano
Merge branch 'js/remote'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-11
Junio C Hamano
Merge branch 'jc/cherry-pick' (early part)
blob
|
commitdiff
|
raw
|
diff to current
2008-03-09
Junio C Hamano
Merge branch 'ph/parseopt'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-09
Junio C Hamano
Merge branch 'sp/fetch-optim'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-09
Junio C Hamano
Merge branch 'jc/describe-always'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-08
Junio C Hamano
Merge branch 'mh/maint-http-proxy-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-03-08
Junio C Hamano
Merge branch 'js/maint-daemon' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-03-08
Junio C Hamano
Merge branch 'js/maint-cvsexport' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-03-08
Junio C Hamano
Merge branch 'jc/maint-log-merge-left-right' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-03-08
Junio C Hamano
Merge branch 'ew/maint-svn-cert-fileprovider' into...
blob
|
commitdiff
|
raw
|
diff to current
2008-03-08
Junio C Hamano
Merge branch 'js/reflog-delete'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-06
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2008-03-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-03-03
Matthieu Moy
Fix incorrect wording in git-merge.txt.
blob
|
commitdiff
|
raw
|
diff to current
2008-03-01
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-03-01
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2008-02-23
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2008-02-23
Junio C Hamano
Merge branch 'bc/reflog-fix' into js/reflog-delete
blob
|
commitdiff
|
raw
|
diff to current
2008-02-17
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-02-17
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-02-13
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-02-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-02-12
Junio C Hamano
Merge branch 'ph/describe-match'
blob
|
commitdiff
|
raw
|
diff to current
2008-01-24
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-01-21
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-01-21
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-01-21
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-01-16
Dave Peticolas
Documentation: fix and clarify grammar in git-merge...
blob
|
commitdiff
|
raw
|
diff to current
2008-01-11
Junio C Hamano
Merge ../gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-01-09
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-01-08
Junio C Hamano
Merge in GIT 1.5.3.8
blob
|
commitdiff
|
raw
|
diff to current
2008-01-07
Dan McGee
Documentation: rename gitlink macro to linkgit
blob
|
commitdiff
|
raw
|
diff to current
2008-01-05
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-12-31
Junio C Hamano
Merge branch 'maint' of git://linux-nfs.org/~bfields/git
blob
|
commitdiff
|
raw
|
diff to current
2007-12-27
Junio C Hamano
Merge branch 'rs/pretty-safety'
blob
|
commitdiff
|
raw
|
diff to current
2007-12-27
Junio C Hamano
Merge branch 'ar/commit-cleanup'
blob
|
commitdiff
|
raw
|
diff to current
2007-12-23
Junio C Hamano
Documentation: describe 'union' low-level merge driver
blob
|
commitdiff
|
raw
|
diff to current
2007-12-18
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-12-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-12-07
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-12-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-12-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-12-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-12-01
Junio C Hamano
Merge 1.5.3.7 in
blob
|
commitdiff
|
raw
|
diff to current
2007-12-01
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-29
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-26
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-25
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-23
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-23
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-21
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-11-21
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-19
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-18
Junio C Hamano
Merge branch 'maint' to synchronize with 1.5.3.6
blob
|
commitdiff
|
raw
|
diff to current
2007-11-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-14
Junio C Hamano
Merge branch 'bs/maint-commit-options'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-14
Junio C Hamano
Merge branch 'rv/maint-index-commit'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-14
Junio C Hamano
Merge branch 'bs/maint-t7005'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-14
Junio C Hamano
Merge branch 'jc/maint-add-sync-stat'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-14
Junio C Hamano
Merge branch 'jc/stash-create'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-12
Junio C Hamano
Merge branch 'sp/maint-plug-traverse-commit-list-leak...
blob
|
commitdiff
|
raw
|
diff to current
2007-11-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-10
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
