summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2009-09-10 17:25:57 +0200
committerJunio C Hamano <gitster@pobox.com>2010-01-12 14:00:58 -0800
commit28fb84382b0eb728534dbe2972bbfec3f3d83dd9 (patch)
treea5e6d66ede6c4ec79a8bd9316077a2d443488848 /merge-recursive.h
parent902f235378cb2b2f6dd5dd664b9630c95321f0ae (diff)
downloadgit-28fb84382b0eb728534dbe2972bbfec3f3d83dd9.tar.gz
Introduce <branch>@{upstream} notation
A new notation '<branch>@{upstream}' refers to the branch <branch> is set to build on top of. Missing <branch> (i.e. '@{upstream}') defaults to the current branch. This allows you to run, for example, for l in list of local branches do git log --oneline --left-right $l...$l@{upstream} done to inspect each of the local branches you are interested in for the divergence from its upstream. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions