index
:
tgif.git
2.36
Terin's Improved Git Fork
terinjokes@gmail.com
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
t
/
t5520-pull.sh
Age
Commit message (
Expand
)
Author
Files
Lines
2019-11-21
t5520: replace `! git` with `test_must_fail git`
Denton Liu
1
-2
/
+2
2019-11-21
t5520: remove redundant lines in test cases
Denton Liu
1
-8
/
+0
2019-11-21
t5520: replace $(cat ...) comparison with test_cmp
Denton Liu
1
-35
/
+70
2019-11-21
t5520: don't put git in upstream of pipe
Denton Liu
1
-1
/
+2
2019-11-21
t5520: test single-line files by git with test_cmp
Denton Liu
1
-16
/
+48
2019-11-21
t5520: use test_cmp_rev where possible
Denton Liu
1
-25
/
+25
2019-11-21
t5520: replace test -{n,z} with test-lib functions
Denton Liu
1
-4
/
+8
2019-11-21
t5520: use test_line_count where possible
Denton Liu
1
-1
/
+2
2019-11-21
t5520: remove spaces after redirect operator
Denton Liu
1
-5
/
+5
2019-11-21
t5520: replace test -f with test-lib functions
Denton Liu
1
-5
/
+5
2019-11-21
t5520: let sed open its own input
Denton Liu
1
-1
/
+1
2019-11-21
t5520: use sq for test case names
Denton Liu
1
-2
/
+2
2019-11-21
t5520: improve test style
Denton Liu
1
-43
/
+45
2018-11-02
tests: optionally skip `git rebase -p` tests
Johannes Schindelin
1
-2
/
+4
2018-08-17
Merge branch 'js/pull-rebase-type-shorthand'
Junio C Hamano
1
-0
/
+12
2018-08-06
pull --rebase=<type>: allow single-letter abbreviations for the type
Johannes Schindelin
1
-0
/
+12
2018-07-11
has_uncommitted_changes(): fall back to empty tree
Jeff King
1
-0
/
+12
2017-07-17
rebase: make resolve message clearer for inexperienced users
William Duclot
1
-2
/
+2
2017-06-01
pull: ff --rebase --autostash works in dirty repo
Tyler Brazier
1
-0
/
+18
2016-12-19
Merge branch 'jc/pull-rebase-ff'
Junio C Hamano
1
-0
/
+17
2016-11-29
pull: fast-forward "pull --rebase=true"
Junio C Hamano
1
-0
/
+17
2016-08-12
t5520: become resilient to GETTEXT_POISON
Vasco Almeida
1
-2
/
+2
2016-07-26
t5520: verify that `pull --rebase` shows the helpful advice when failing
Johannes Schindelin
1
-0
/
+32
2016-07-13
Merge branch 'va/i18n-even-more'
Junio C Hamano
1
-1
/
+1
2016-06-17
i18n: advice: internationalize message for conflicts
Vasco Almeida
1
-1
/
+1
2016-05-20
pull: warn on --verify-signatures with --rebase
Alexander Hirsch
1
-0
/
+16
2016-04-04
t5520: test --[no-]autostash with pull.rebase=true
Mehul Jain
1
-0
/
+10
2016-04-04
t5520: reduce commom lines of code
Mehul Jain
1
-9
/
+7
2016-04-04
t5520: factor out common "failing autostash" code
Mehul Jain
1
-15
/
+11
2016-04-04
t5520: factor out common "successful autostash" code
Mehul Jain
1
-29
/
+15
2016-04-04
t5520: use better test to check stderr output
Mehul Jain
1
-6
/
+4
2016-04-04
t5520: ensure consistent test conditions
Mehul Jain
1
-0
/
+2
2016-04-04
t5520: use consistent capitalization in test titles
Mehul Jain
1
-2
/
+2
2016-03-21
pull --rebase: add --[no-]autostash flag
Mehul Jain
1
-0
/
+70
2016-01-13
pull: allow interactive rebase with --rebase=interactive
Johannes Schindelin
1
-0
/
+10
2015-08-17
Merge branch 'kd/pull-rebase-autostash'
Junio C Hamano
1
-0
/
+11
2015-07-22
pull: allow dirty tree when rebase.autostash enabled
Kevin Daudt
1
-0
/
+12
2015-06-02
pull: handle git-fetch's options as well
Paul Tan
1
-0
/
+20
2015-05-29
t5520: check reflog action in fast-forward merge
Paul Tan
1
-3
/
+10
2015-05-29
t5520: test --rebase failure on unborn branch with index
Paul Tan
1
-0
/
+15
2015-05-29
t5520: test --rebase with multiple branches
Paul Tan
1
-0
/
+9
2015-05-29
t5520: test work tree fast-forward when fetch updates head
Paul Tan
1
-0
/
+21
2015-05-29
t5520: test for failure if index has unresolved entries
Paul Tan
1
-0
/
+19
2015-05-18
t5520: test no merge candidates cases
Paul Tan
1
-0
/
+55
2015-05-18
t5520: prevent field splitting in content comparisons
Paul Tan
1
-35
/
+35
2015-04-29
t5520: test pulling an octopus into an unborn branch
Junio C Hamano
1
-0
/
+9
2015-04-29
t5520: style fixes
Junio C Hamano
1
-16
/
+6
2013-09-04
pull: allow pull to preserve merges when rebasing
Stephen Haberman
1
-0
/
+89
2013-06-27
Merge branch 'jk/pull-into-dirty-unborn'
Junio C Hamano
1
-0
/
+29
2013-06-20
pull: merge into unborn by fast-forwarding from empty tree
Thomas Rast
1
-0
/
+29
[next]