summaryrefslogtreecommitdiff
path: root/archive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-08-03 11:01:26 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-03 11:01:27 -0700
commit980a3d3dd742d534b394b04e578c2de5e3ee4793 (patch)
tree1ccb2f6d9c0f64dbbb21eef6fc7a3a373176cae6 /archive.c
parentMerge branch 'sg/bash-prompt-untracked-optim' (diff)
parentt3901: test git-am encoding conversion (diff)
downloadtgif-980a3d3dd742d534b394b04e578c2de5e3ee4793.tar.xz
Merge branch 'pt/am-tests'
* pt/am-tests: t3901: test git-am encoding conversion t3418: non-interactive rebase --continue with rerere enabled t4150: tests for am --[no-]scissors t4150: am with post-applypatch hook t4150: am with pre-applypatch hook t4150: am with applypatch-msg hook t4150: am --resolved fails if index has unmerged entries t4150: am --resolved fails if index has no changes t4150: am refuses patches when paused t4151: am --abort will keep dirty index intact t4150: am fails if index is dirty t4150: am.messageid really adds the message id
Diffstat (limited to 'archive.c')
0 files changed, 0 insertions, 0 deletions