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
/
t
/
t3507-cherry-pick-conflict.sh
Age
Commit message (
Expand
)
Author
2022-06-06
tests: don't assume a .git/info for .git/info/sparse-checkout
Ævar Arnfjörð Bjarmason
2021-08-23
cherry-pick: use better advice message
ZheNing Hu
2021-02-11
tests: remove most uses of test_i18ncmp
Ævar Arnfjörð Bjarmason
2020-11-20
t3[5-9]*: adjust the references to the default branch name "main"
Johannes Schindelin
2020-11-20
tests: mark tests relying on the current default for `init.defaultBranch`
Johannes Schindelin
2020-08-20
Merge branch 'en/sequencer-merge-labels'
Junio C Hamano
2020-08-14
sequencer: avoid garbled merge machinery messages due to commit labels
Elijah Newren
2020-08-07
t: don't spuriously close and reopen quotes
Martin Ågren
2020-03-25
Merge branch 'pw/advise-rebase-skip'
Junio C Hamano
2020-01-27
t3507: use test_path_is_missing()
Denton Liu
2020-01-27
t3507: fix indentation
Denton Liu
2019-12-06
cherry-pick: check commit error messages
Phillip Wood
2019-05-13
Merge branch 'pw/clean-sequencer-state-upon-final-commit'
Junio C Hamano
2019-05-08
Merge branch 'dl/merge-cleanup-scissors-fix'
Junio C Hamano
2019-04-19
cherry-pick/revert: add scissors line on merge conflict
Denton Liu
2019-04-18
t3507: clean up style
Denton Liu
2019-04-17
commit/reset: try to clean up sequencer state
Phillip Wood
2019-03-18
cherry-pick --continue: remember options
Phillip Wood
2019-03-18
cherry-pick: demonstrate option amnesia
Phillip Wood
2018-07-27
merge-recursive: preserve skip_worktree bit when necessary
Elijah Newren
2018-07-27
t3507: add a testcase showing failure with sparse checkout
Ben Peart
2014-10-29
merge & sequencer: turn "Conflicts:" hint into a comment
Junio C Hamano
2012-12-23
tests: move test_cmp_rev to test-lib-functions
Martin von Zweigbergk
2012-09-14
cherry-pick: don't forget -s on failure
Miklos Vajna
2012-02-22
cherry-pick: No advice to commit if --no-commit
Phil Hord
2011-11-23
revert: write REVERT_HEAD pseudoref during conflicted revert
Jonathan Nieder
2011-10-07
revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so
Jay Soffian
2011-04-14
i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507
Junio C Hamano
2011-04-02
Merge branch 'ab/i18n-st'
Junio C Hamano
2011-03-10
i18n: git-revert split up "could not revert/apply" message
Ævar Arnfjörð Bjarmason
2011-02-22
Teach commit about CHERRY_PICK_HEAD
Jay Soffian
2011-02-22
Introduce CHERRY_PICK_HEAD
Jay Soffian
2011-02-22
t3507: introduce pristine-detach helper
Jonathan Nieder
2010-08-19
tests: fix syntax error in "Use advise() for hints" test
Ævar Arnfjörð Bjarmason
2010-08-16
cherry-pick/revert: Use advise() for hints
Jonathan Nieder
2010-04-11
t3507: Make test executable
Stephen Boyd
2010-03-21
cherry-pick, revert: add a label for ancestor
Jonathan Nieder
2010-03-21
revert: clarify label on conflict hunks
Jonathan Nieder
2010-03-21
tests: document cherry-pick behavior in face of conflicts
Jonathan Nieder