Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
git-merge-octopus.sh
Age
Commit message (
Expand
)
Author
2017-09-10
Merge branch 'ma/up-to-date'
Junio C Hamano
2017-08-23
treewide: correct several "up-to-date" to "up to date"
Martin Ă…gren
2017-08-07
scripts: use "git foo" not "git-foo"
Michael Forney
2016-09-08
git-merge-octopus: do not capitalize "octopus"
Alex Henrie
2016-06-18
i18n: git-sh-setup.sh: mark strings for translation
Vasco Almeida
2016-06-18
merge-octopus: use die shell function from git-sh-setup.sh
Vasco Almeida
2016-06-18
i18n: merge-octopus: mark messages for translation
Vasco Almeida
2016-04-13
merge-octopus: abort if index does not match HEAD
Elijah Newren
2010-10-02
merge-octopus: Work around environment issue on Windows
Johannes Schindelin
2009-12-14
octopus: remove dead code
Stephen Boyd
2009-12-14
octopus: reenable fast-forward merges
Stephen Boyd
2009-12-14
octopus: make merge process simpler to follow
Stephen Boyd
2008-07-30
git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge
Junio C Hamano
2007-07-03
Rewrite "git-frotz" to "git frotz"
Junio C Hamano
2006-02-07
read-tree --aggressive
Junio C Hamano
2006-01-15
octopus: allow manual resolve on the last round.
Junio C Hamano
2006-01-13
octopus: allow criss-cross and clarify the message when it rejects
Junio C Hamano
2005-11-29
define die() for scripts that use it.
Junio C Hamano
2005-11-11
octopus: do not do AND'ed merge base.
Junio C Hamano
2005-09-11
Multi-backend merge driver.
Junio C Hamano