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
2007-11-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-08
Junio C Hamano
Merge branch 'jc/clean-config'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-08
Junio C Hamano
Merge branch 'ds/maint-deflatebound'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-08
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-04
Junio C Hamano
Merge branch 'jc/revert-merge'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-02
Junio C Hamano
Merge branch 'ph/parseopt'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-02
Junio C Hamano
Merge branch 'np/progress'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-02
Junio C Hamano
Merge branch 'gp/maint-diffdoc'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-01
Junio C Hamano
Merge branch 'bk/maint-cvsexportcommit'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-01
Junio C Hamano
Merge branch 'js/forkexec'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-01
Junio C Hamano
Merge branch 'sp/mergetool'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-01
Junio C Hamano
Merge branch 'sp/help'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-01
Junio C Hamano
Merge branch 'kh/commit'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-31
Junio C Hamano
Merge branch 'maint' to catch up with 1.5.3.5
blob
|
commitdiff
|
raw
|
diff to current
2007-10-31
Junio C Hamano
Merge branch 'maint' into HEAD
blob
|
commitdiff
|
raw
|
diff to current
2007-10-30
Junio C Hamano
git-merge: document but discourage the historical syntax
blob
|
commitdiff
|
raw
|
diff to current
2007-10-29
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-28
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-10-27
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-21
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-21
Shawn O. Pearce
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-10-21
Shawn O. Pearce
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-10-19
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-19
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-18
Shawn O. Pearce
Merge branch 'jc/am-quiet'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-18
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-18
Shawn O. Pearce
Merge branch 'lt/diff-rename'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-17
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-16
Shawn O. Pearce
Merge branch 'master' into db/fetch-pack
blob
|
commitdiff
|
raw
|
diff to current
2007-10-16
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-03
Junio C Hamano
Merge branch 'mv/unknown'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-03
Junio C Hamano
Merge branch 'ph/strbuf'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-03
Junio C Hamano
Merge branch 'lh/merge'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-03
Junio C Hamano
Merge branch 'js/rebase-i'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-03
Junio C Hamano
Merge branch 'jc/autogc'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-29
Junio C Hamano
Merge branch 'gr/smtp'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-29
Junio C Hamano
Merge branch 'ss/svnimport'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-29
Junio C Hamano
Merge branch 'sv/svn'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-29
Junio C Hamano
Merge branch 'ml/submodule'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-29
Junio C Hamano
Merge branch 'jb/remote-rm'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-29
Junio C Hamano
Merge branch 'jk/diff-rename'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-29
Junio C Hamano
Sync with GIT 1.5.3.3
blob
|
commitdiff
|
raw
|
diff to current
2007-09-26
Shawn Bohrer
Fix spelling of overridden in documentation
blob
|
commitdiff
|
raw
|
diff to current
2007-09-24
Lars Hjemli
git-merge: add support for branch.<name>.mergeoptions
blob
|
commitdiff
|
raw
|
diff to current
2007-09-18
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-08-29
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-08-27
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-08-26
J. Bruce Fields
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-08-21
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-08-19
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-08-19
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-08-16
Junio C Hamano
Merge branch 'maint' to sync with 1.5.2.5
blob
|
commitdiff
|
raw
|
diff to current
2007-08-13
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-08-11
Junio C Hamano
Merge branch 'cr/tag'
blob
|
commitdiff
|
raw
|
diff to current
2007-08-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-08-05
J. Bruce Fields
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-08-02
Steve Hoelzer
Try to be consistent with capitalization in the documen...
blob
|
commitdiff
|
raw
|
diff to current
2007-08-01
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-30
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-07-28
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-07-19
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-15
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git/fastimport
blob
|
commitdiff
|
raw
|
diff to current
2007-07-14
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-07-13
Jakub Narebski
Update git-merge documentation.
blob
|
commitdiff
|
raw
|
diff to current
2007-07-12
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-07-12
Junio C Hamano
Merge commit 'git-gui/master'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-12
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-07-10
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-02
Junio C Hamano
Merge 1.5.2.3 in
blob
|
commitdiff
|
raw
|
diff to current
2007-07-01
Junio C Hamano
Merge branch 'ml/worktree'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-01
Junio C Hamano
Merge branch 'ei/worktree+filter'
blob
|
commitdiff
|
raw
|
diff to current
2007-06-30
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-06-29
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-06-29
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-06-29
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-06-28
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-06-27
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-06-26
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk into...
blob
|
commitdiff
|
raw
|
diff to current
2007-06-23
Junio C Hamano
Merge branch 'js/filter'
blob
|
commitdiff
|
raw
|
diff to current
2007-06-22
Shawn O. Pearce
Import branch 'git-p4' of git://repo.or.cz/fast-export
blob
|
commitdiff
|
raw
|
diff to current
2007-06-16
Junio C Hamano
Merge branch 'maint' to sync with GIT 1.5.2.2
blob
|
commitdiff
|
raw
|
diff to current
2007-06-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-06-13
Junio C Hamano
Merge branch 'aw/cvs'
blob
|
commitdiff
|
raw
|
diff to current
2007-06-13
Junio C Hamano
Merge branch 'ep/cvstag'
blob
|
commitdiff
|
raw
|
diff to current
2007-06-12
Junio C Hamano
Merge branch 'lh/submodule'
blob
|
commitdiff
|
raw
|
diff to current
2007-06-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-06-12
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-06-12
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-06-11
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-06-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
