Skip to main content

Browse the archive

Staging
v0.5.2
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 7bd9641df5b7cca91b21bfdc587962c59700786c authored by Junio C Hamano on 08 November 2006, 00:20:02 UTC, committed by Junio C Hamano on 08 November 2006, 00:24:37 UTC 
git-pickaxe: allow "-L <something>,+N"
 
With this,

	git pickaxe -L '/--progress/,+20' v1.4.0 -- pack-objects.c

gives you 20 lines starting from the first occurrence of
'--progress' in pack-objects, digging from v1.4.0 version.

You can also say

	git pickaxe -L '/--progress/,-5' v1.4.0 -- pack-objects.c

Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 931233b
Raw File
Tip revision: 7bd9641df5b7cca91b21bfdc587962c59700786c authored by Junio C Hamano on 08 November 2006, 00:20:02 UTC
git-pickaxe: allow "-L <something>,+N"
Tip revision: 7bd9641
git-merge-ours.sh 
#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#
# Pretend we resolved the heads, but declare our tree trumps everybody else.
#

# We need to exit with 2 if the index does not match our HEAD tree,
# because the current index is what we will be committing as the
# merge result.

test "$(git-diff-index --cached --name-status HEAD)" = "" || exit 2

exit 0
back to top