tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Documentation: sync git.txt command list and manual page title
[git.git]
/
Documentation
/
git-merge.txt
2007-01-18
Junio C Hamano
Documentation: sync git.txt command list and manual...
blob
|
commitdiff
|
raw
2007-01-15
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-01-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-01-05
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-29
Junio C Hamano
Merge branch 'jc/curl'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-29
Junio C Hamano
Merge branch 'jc/utf8'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-29
Junio C Hamano
Merge branch 'jc/make'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-28
Junio C Hamano
Merge branch 'js/shallow'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-28
Shawn O. Pearce
Use GIT_REFLOG_ACTION environment variable instead.
blob
|
commitdiff
|
raw
|
diff to current
2006-12-27
Junio C Hamano
Merge branch 'master' into js/shallow
blob
|
commitdiff
|
raw
|
diff to current
2006-12-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-20
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-13
Junio C Hamano
Merge branch 'jc/commit-careful'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-05
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-29
Junio C Hamano
Merge master.kernel.org:/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-11-29
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-29
Junio C Hamano
Merge branch 'jc/globfetch'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-29
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-27
Junio C Hamano
Merge branch 'js/shortlog'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-27
Junio C Hamano
Merge branch 'jc/push-delete-ref'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-27
Junio C Hamano
Merge branch 'jc/merge'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-22
Junio C Hamano
git-merge: make it usable as the first class UI
blob
|
commitdiff
|
raw
|
diff to current
2006-11-08
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-09-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
Merge branch 'jc/upload-pack'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
Merge branch 'th/diff-extra'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
GIT 1.4.2
v1.4.2
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-08-08
Junio C Hamano
Merge branch 'master' into pb/gitpm
blob
|
commitdiff
|
raw
|
diff to current
2006-07-30
Junio C Hamano
Merge branch 'jn/make'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-26
Junio C Hamano
Merge branch 'pb/configure'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-13
Junio C Hamano
Merge branch 'ml/trace'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-13
Junio C Hamano
Merge branch 'lt/prune'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-13
Junio C Hamano
Merge branch 'lt/merge-tree'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-10
Junio C Hamano
Merge branch 'jc/show-merge'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-10
Junio C Hamano
Merge branch 'lt/gitweb'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-10
Junio C Hamano
Merge branch 'jc/rename'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-10
Junio C Hamano
Merge branch 'jc/grep'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-10
Junio C Hamano
Merge branch 'jc/mailinfo'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-10
Junio C Hamano
Merge branch 'ew/diff'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-10
Junio C Hamano
Merge branch 'ew/svn'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-09
Pavel Roskin
Assorted typo fixes
blob
|
commitdiff
|
raw
|
diff to current
2006-06-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-06-10
Junio C Hamano
Merge git://git.kernel.org/pub/scm/git/gitweb
blob
|
commitdiff
|
raw
|
diff to current
2006-06-07
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-06-04
Junio C Hamano
Merge branch 'new' of git://git./gitk/gitk into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-05-03
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-04-24
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-04-17
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-04-07
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-04-05
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-03-31
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-03-26
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-02-22
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-02-07
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-12-21
Junio C Hamano
GIT 1.0.0
v1.0.0
blob
|
commitdiff
|
raw
|
diff to current
2005-12-17
Junio C Hamano
Examples of resetting.
blob
|
commitdiff
|
raw
|
diff to current
2005-12-07
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-12-04
Junio C Hamano
GIT 0.99.9l aka 1.0rc4
v0.99.9l
v1.0rc4
blob
|
commitdiff
|
raw
|
diff to current
2005-12-02
Junio C Hamano
git-merge documentation: conflicting merge leaves highe...
blob
|
commitdiff
|
raw
|
diff to current
2005-11-29
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-11-29
Junio C Hamano
Documentation: Describe merge operation a bit better.
blob
|
commitdiff
|
raw
|
diff to current
2005-11-28
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-11-27
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-11-22
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-11-20
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-11-19
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-11-07
Junio C Hamano
Merge branch 'master'
blob
|
commitdiff
|
raw
|
diff to current
2005-11-07
Jon Loeliger
Refactored merge options into separate merge-options...
blob
|
commitdiff
|
raw
|
diff to current
2005-11-07
Junio C Hamano
GIT 0.99.9e
v0.99.9e
blob
|
commitdiff
|
raw
|
diff to current
2005-11-06
Jon Loeliger
Refactor merge strategies into separate includable...
blob
|
commitdiff
|
raw
|
diff to current
2005-11-05
Junio C Hamano
GIT 0.99.9d
v0.99.9d
blob
|
commitdiff
|
raw
|
diff to current
2005-11-05
Junio C Hamano
Documentation: git-fetch/pull updates.
blob
|
commitdiff
|
raw
|
diff to current
2005-11-04
Junio C Hamano
Documentation: -merge and -pull: describe merge strategies.
blob
|
commitdiff
|
raw
|
diff to current
2005-11-02
Junio C Hamano
GIT 0.99.9b
v0.99.9b
blob
|
commitdiff
|
raw
|
diff to current
2005-11-01
Petr Baudis
Documentation for git-fmt-merge-msg
blob
|
commitdiff
|
raw
|
diff to current
2005-10-31
Junio C Hamano
GIT 0.99.9a
v0.99.9a
blob
|
commitdiff
|
raw
|
diff to current
2005-10-27
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-10-23
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-21
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-18
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-16
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-16
Junio C Hamano
Merge branch 'svn' of netz.smurf.noris.de/git/git
blob
|
commitdiff
|
raw
|
diff to current
2005-10-15
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-12
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-10
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-10
Junio C Hamano
Remove the version tags from the manpages
blob
|
commitdiff
|
raw
|
diff to current
2005-09-27
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-09-25
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-09-24
Junio C Hamano
Merge 'fixes' branch.
blob
|
commitdiff
|
raw
|
diff to current
2005-09-23
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-09-21
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
