summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorJiang Xin <worldhello.net@gmail.com>2020-03-11 06:59:05 (GMT)
committerJiang Xin <worldhello.net@gmail.com>2020-03-11 06:59:05 (GMT)
commit52b2742df81a528f1fb0c5fa89bb408781459576 (patch)
tree1c075ab0c311e094d3dfbab3f1c018d3772af348 /po
parent964344198381c62b17f02db49bad1cea7df59976 (diff)
parentb4374e96c84ed9394fed363973eb540da308ed4f (diff)
downloadgit-52b2742df81a528f1fb0c5fa89bb408781459576.zip
git-52b2742df81a528f1fb0c5fa89bb408781459576.tar.gz
git-52b2742df81a528f1fb0c5fa89bb408781459576.tar.bz2
Merge branch 'master' of github.com:git/git into git-po-master
* 'master' of github.com:git/git: (27 commits) Git 2.26-rc1 remote-curl: show progress for fetches over dumb HTTP show_one_mergetag: print non-parent in hex form. config.mak.dev: re-enable -Wformat-zero-length rebase-interactive.c: silence format-zero-length warnings mingw: workaround for hangs when sending STDIN t6020: new test with interleaved lexicographic ordering of directories t6022, t6046: test expected behavior instead of testing a proxy for it t3035: prefer test_must_fail to bash negation for git commands t6020, t6022, t6035: update merge tests to use test helper functions t602[1236], t6034: modernize test formatting merge-recursive: apply collision handling unification to recursive case completion: add diff --color-moved[-ws] t1050: replace test -f with test_path_is_file am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch am: support --show-current-patch=raw as a synonym for--show-current-patch am: convert "resume" variable to a struct parse-options: convert "command mode" to a flag parse-options: add testcases for OPT_CMDMODE() stash push: support the --pathspec-from-file option ...
Diffstat (limited to 'po')
0 files changed, 0 insertions, 0 deletions