summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-10-01 02:07:47 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-10-01 02:07:47 -0700
commit5946d4ba8970f00bb62b2c9e8714264831034043 (patch)
treeeae61e6a249fd1daa023f5dae3be661779cfe79c /Documentation/merge-options.txt
parentgit stash: document apply's --index switch (diff)
downloadtgif-5946d4ba8970f00bb62b2c9e8714264831034043.tar.xz
Whip post 1.5.3.3 maintenance series into shape.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions