repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
add tests for merge-index / merge-one-file
2011-04-29
Jef
f
King
add t
e
st
s
for merge-i
n
de
x
/ merge-one-f
i
le
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-17
Jeff
K
ing
di
f
f:
u
se
l
a
r
ge integers for
d
iffstat calculations
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-08
Jeff King
docs: clar
i
f
y "branc
h
-l"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-03-14
Jeff
King
dir: fix COLLECT_IGNO
R
ED on e
x
cluded prefixes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-24
Jef
f
King
p
ush:
fix se
g
f
a
ul
t
for
odd config
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-23
Jeff King
a
dd
-
interactive
:
fix bogus
diff head
e
r li
n
e or
d
ering
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-19
J
e
f
f Kin
g
rm: fi
x
b
ug
in recursive
su
b
d
i
rectory removal
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-18
J
eff
King
docs: don'
t
t
al
k
about $GIT_DIR/ref
s
/
e
v
erywhere
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-16
Jeff King
dwim_ref: fix dan
g
ling s
y
mref w
a
r
ning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
Jef
f
K
i
ng
cherry-pick:
pret
t
ify the advic
e
message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
Jeff
King
c
herry-pick: sho
w
c
o
mmit name
instead of sh
a
1
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
Jeff King
cherry-pick: for
m
at
h
elp message as
strbuf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
J
e
f
f
K
i
n
g
cherry-pick: refa
c
to
r
commit parsing code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
Jeff King
c
h
err
y
-pic
k
:
r
ewrap
a
dvice message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
Jeff King
am: switc
h
--resolv
e
d to --co
n
t
inue
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-07
J
e
ff King
accept "git gr
e
p -- pattern"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-06
J
e
ff King
Fix inv
a
lid read in q
u
ote_c_s
t
yl
e
_counted
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-06
Jeff King
docs: fix filter-branch example for quoted
paths
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-31
Jeff King
mention n
e
w she
l
l e
x
ecuti
o
n beh
a
vior in release no
t
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-29
Jeff King
add sheb
a
ng line to git-mergetool--l
i
b
.
sh
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-29
Jeff
Kin
g
fix off-by-one allocation e
r
ror
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-29
Jeff King
fix
memcp
y
of
o
ve
r
lapp
i
n
g
area
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-28
J
eff Kin
g
reject @{-1} not at beginning
of object name
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-28
J
eff
King
f
ix parsi
n
g of @{-1}@{u
}
combinatio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-28
Jeff
K
i
ng
test combi
n
at
i
ons of
@
{} syntax
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-28
Jeff
King
r
ere
r
e: fix too-short initi
a
lization
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-28
Jeff
King
t
0
101: use
a
bsolute date
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-14
Jeff K
i
ng
commi
t
: allow
suppressi
o
n of implici
t
ide
n
tity advice
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-14
Jeff King
co
m
m
i
t:
s
how int
e
resting i
d
ent i
n
f
o
r
mation in
summar
y
Committer:
Jeff King
<peff@c-71-185-130-222.hsd1.va...
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-14
J
ef
f
King
strbuf: add
s
t
rbuf_addbuf_
p
ercentquo
t
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-14
Jeff King
strbuf_expand: convert "%%" to "%
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-06
Jeff King
diff: run exter
n
al diff helpe
r
with she
l
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-06
Jeff King
t
e
x
tconv: use shel
l
to run helper
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-06
Jef
f
Kin
g
editor: use run_command's shell feature
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-06
J
e
ff King
run-command: opti
m
ize out use
l
es
s
s
h
ell call
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-06
Je
f
f King
run-command: co
n
ver
t
simple callsites to use_shell
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-02
J
e
ff King
run-com
m
a
n
d: add "use shell"
op
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-30
J
e
ff King
t
e
xtc
o
nv: stop
l
e
a
kin
g
file desc
r
ipto
r
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-30
Je
f
f
King
r
e
set: unbreak
hard resets with GIT_
W
ORK_TREE
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-16
Jeff King
ignore
u
nkno
w
n
c
olor conf
i
g
u
ration
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-08
Jeff King
add-interactive:
fix deletion of non-em
p
ty files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-07
J
e
ff King
tests: han
d
l
e
NO_PYT
H
ON setting
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-07
Jeff K
i
ng
status: reduce duplic
a
te
d
s
e
tup code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-07
Jeff Ki
n
g
status: disable color for porce
l
ain fo
r
mat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
rese
t
: improv
e
wo
r
ktree safety
v
alves
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
rerere: don't segfault on fa
i
lure
t
o
o
pen rr-cache
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-26
Jeff King
tests: rename du
p
li
c
a
t
e t1009
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-24
Jeff King
prune-packed: only show pr
o
gress when
s
tderr is a tty
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-16
J
e
f
f
King
diffco
r
e
-
b
r
eak: save
c
nt_data for
ot
h
er phas
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-16
J
eff King
diffcore-b
r
eak: free f
i
lespec data as we go
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-09
Jeff King
format-patch: make "-p" suppress dif
f
s
t
a
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
Jeff King
push: fix typo in usage
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
Jeff King
t
915
{
0
,1
}
: use
$
TEST_D
I
REC
T
O
R
Y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
Jeff King
l
s-files: unbre
a
k "ls-files -i"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-28
Je
f
f Kin
g
add-in
t
eractive: handle del
e
tion of empty files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-28
Jeff King
g
i
tignore: root most patte
r
ns at the top-level dir
e
ctory
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-26
J
e
ff King
push: always load default config
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-20
Jeff King
imap-send: remove u
s
e
l
ess uid
c
ode
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-19
Jeff
K
ing
cv
s
import: fix relative a
r
gume
n
t filenames
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-19
Jeff King
docume
n
t p
u
sh
'
s new q
u
i
e
t option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-12
Jef
f
Ki
n
g
ls-
f
i
l
es: ex
c
ludes should
not impact
tra
c
ked files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-09
Jeff
K
ing
pull: im
p
rov
e
advice fo
r
unconfigured e
r
ror case
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-29
Jeff King
improve ref
l
og date/number heuristic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jeff King
r
e
base: use plumbing to
sho
w
dirty state
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jeff King
statu
s
: make "how to
sta
g
e"
m
essages o
p
tio
n
a
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jeff King
p
u
sh:
m
ake non-fast-
f
orward help message con
f
igurable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff Kin
g
push:
re-fl
o
w non-fa
s
t-for
w
a
r
d message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Je
f
f King
push: fi
x
english in non-fast
-
forward
messag
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
d
ocs:
n
ote
t
ha
t
status
c
onfig
u
rati
o
n
a
ffects only
l
o
n
g
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
commit: suppo
r
t a
l
ternate
s
tatus fo
r
m
a
ts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff K
i
ng
s
t
atus
:
add --porcelain o
u
t
put f
o
rm
a
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
status: refactor
form
a
t op
t
ion par
s
ing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff
K
i
n
g
statu
s
: refa
c
tor
shor
t
-mod
e
printing t
o
i
t
s own function
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
status: typo fix in u
s
a
ge
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-03
Jef
f
King
push: t
e
ach
-
-
q
u
i
et to suppress "Ever
y
thing up-to-dat
e
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-03
Jeff King
c
lone: disconne
c
t transport a
f
ter fetching
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jeff Kin
g
fix
approxidat
e
pa
r
sing of re
l
ative months
a
nd y
e
ars
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jeff
K
i
ng
tests
:
a
dd date p
r
inting and p
a
rsing test
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jeff King
re
f
ac
t
or
test-date int
e
r
f
ace
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-27
Jeff K
i
ng
c
lone: add --bra
n
ch opti
o
n to select a different HEAD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-25
Je
f
f
Kin
g
checkout: do not imply "-
f
" on
unb
o
rn branche
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-18
Jeff King
t
e
sts: disable interactive hunk s
e
lectio
n
tests if
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-17
Jeff King
docs: descri
b
e impact of repack on "clone
-s"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-12
Jeff King
allow pull --rebase
o
n bran
c
h
yet to be born
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jef
f
K
ing
me
r
ge:
indicate remote tracki
n
g branches in
mer
g
e
message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
merge: fix incorrect merge mes
s
age for ambiguous tag
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
a
d
d tests for m
e
r
ge message headings
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
t/M
a
kefile:
include confi
g
.
mak
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff
K
ing
tests: allow user to specify trash
director
y
l
o
ca
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
J
e
ff
King
tests:
p
ro
v
ide
$
TRASH_
D
IRE
C
TORY vari
a
b
le
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
J
eff King
tests: use "
$
TEST
_
DIRECTORY" ins
t
ead
o
f "
.
.
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-07
Jeff King
Make
f
i
l
e: git-
h
ttp-fetch does
n
ot
need expat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
Jeff
K
ing
tran
s
po
r
t: d
o
n't s
h
ow push status if --q
u
i
et is given
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
Je
f
f King
transport
:
pass "quiet" flag to
pa
c
k-objects
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
Jef
f
K
ing
push: add --quiet flag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-24
J
eff King
se
n
d-email
:
detect cy
c
les in al
i
a
s
expansion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-19
Jeff King
show: add s
p
ace betwe
e
n mult
i
p
l
e
it
e
ms
Tagger:
Jeff King
<peff@peff.net>
Author:
Jeff King
<peff@peff.net>
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-19
Jeff King
sh
o
w: suppres
s
extr
a
newline when
showing ann
o
tated tag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-09
Jeff King
Makefile: install 'git'
in execdir
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-01
Jeff King
log-tree: fix confusin
g
c
o
mment
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next