summaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
diff options
context:
space:
mode:
authorLibravatar Rene Scharfe <rene.scharfe@lsrfire.ath.cx>2006-07-02 01:29:26 +0200
committerLibravatar Junio C Hamano <junkio@cox.net>2006-07-01 18:13:25 -0700
commit31609c17251f368584f7b94d44b06194112b4251 (patch)
tree5ce49fdf0575f1716310b52b94db51f308ee891c /Documentation/git-am.txt
parentmove get_merge_bases() to core lib. (diff)
downloadtgif-31609c17251f368584f7b94d44b06194112b4251.tar.xz
Add get_merge_bases_clean()
Add get_merge_bases_clean(), a wrapper for get_merge_bases() that cleans up after doing its work and make get_merge_bases() NOT clean up. Single-shot programs like git-merge-base can use the dirty and fast version. Also move the object flags used in get_merge_bases() out of the range defined in revision.h. This fixes the "66ae0c77...ced9456a 89719209...262a6ef7" test of the ... operator which is introduced with the next patch. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-am.txt')
0 files changed, 0 insertions, 0 deletions