projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
daemon: do not forbid user relative paths unconditionally under --base-path
[git.git]
/
Documentation
/
git-merge.txt
2005-12-21
Junio C Hamano
GIT 1.0.0
v1.0.0
blob
|
commitdiff
2005-12-17
Junio C Hamano
Examples of resetting.
blob
|
commitdiff
2005-12-07
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
diff to current
2005-12-04
Junio C Hamano
GIT 0.99.9l aka 1.0rc4
v0.99.9l
v1.0rc4
blob
|
commitdiff
|
diff to current
2005-12-02
Junio C Hamano
git-merge documentation: conflicting merge leaves highe...
blob
|
commitdiff
|
diff to current
2005-11-29
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
diff to current
2005-11-29
Junio C Hamano
Documentation: Describe merge operation a bit better.
blob
|
commitdiff
|
diff to current
2005-11-28
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
diff to current
2005-11-27
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
diff to current
2005-11-22
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
diff to current
2005-11-20
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
diff to current
2005-11-19
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
diff to current
2005-11-07
Junio C Hamano
Merge branch 'master'
blob
|
commitdiff
|
diff to current
2005-11-07
Jon Loeliger
Refactored merge options into separate merge-options...
blob
|
commitdiff
|
diff to current
2005-11-07
Junio C Hamano
GIT 0.99.9e
v0.99.9e
blob
|
commitdiff
|
diff to current
2005-11-06
Jon Loeliger
Refactor merge strategies into separate includable...
blob
|
commitdiff
|
diff to current
2005-11-05
Junio C Hamano
GIT 0.99.9d
v0.99.9d
blob
|
commitdiff
|
diff to current
2005-11-05
Junio C Hamano
Documentation: git-fetch/pull updates.
blob
|
commitdiff
|
diff to current
2005-11-04
Junio C Hamano
Documentation: -merge and -pull: describe merge strategies.
blob
|
commitdiff
|
diff to current
2005-11-02
Junio C Hamano
GIT 0.99.9b
v0.99.9b
blob
|
commitdiff
|
diff to current
2005-11-01
Petr Baudis
Documentation for git-fmt-merge-msg
blob
|
commitdiff
|
diff to current
2005-10-31
Junio C Hamano
GIT 0.99.9a
v0.99.9a
blob
|
commitdiff
|
diff to current
2005-10-27
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
diff to current
2005-10-23
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
diff to current
2005-10-21
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
diff to current
2005-10-18
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
diff to current
2005-10-16
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
diff to current
2005-10-16
Junio C Hamano
Merge branch 'svn' of netz.smurf.noris.de/git/git
blob
|
commitdiff
|
diff to current
2005-10-15
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
diff to current
2005-10-12
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
diff to current
2005-10-10
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
diff to current
2005-10-10
Junio C Hamano
Remove the version tags from the manpages
blob
|
commitdiff
|
diff to current
2005-09-27
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
diff to current
2005-09-25
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
diff to current
2005-09-24
Junio C Hamano
Merge 'fixes' branch.
blob
|
commitdiff
|
diff to current
2005-09-23
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
diff to current
2005-09-21
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
diff to current
2005-09-20
Sergey Vlasov
[PATCH] Documentation: Update all files to use the...
blob
|
commitdiff
|
diff to current
2005-09-11
Junio C Hamano
'git-merge': Documentation.
blob
|
commitdiff
|
diff to current
projects / git.git / history