diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-07 16:15:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-07 16:15:32 -0700 |
| commit | 81b4f18fb8f9356477157a3b9f0652d371cba835 (patch) | |
| tree | 43c7f1ff37f8c9dabc1946325edeaedd1b9a6832 /resolve-undo.c | |
| parent | build: do not install git-remote-testpy (diff) | |
| parent | git-remote-testgit: build it to run under $SHELL_PATH (diff) | |
| download | tgif-81b4f18fb8f9356477157a3b9f0652d371cba835.tar.xz | |
Merge branch 'js/transport-helper-error-reporting-fix' into fc/makefile
* js/transport-helper-error-reporting-fix:
git-remote-testgit: build it to run under $SHELL_PATH
git-remote-testgit: further remove some bashisms
git-remote-testgit: avoid process substitution
t5801: "VAR=VAL shell_func args" is forbidden
transport-helper: update remote helper namespace
transport-helper: trivial code shuffle
transport-helper: warn when refspec is not used
transport-helper: clarify pushing without refspecs
transport-helper: update refspec documentation
transport-helper: clarify *:* refspec
transport-helper: improve push messages
transport-helper: mention helper name when it dies
transport-helper: report errors properly
Conflicts:
t/t5801-remote-helpers.sh
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions