repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jk/maint-add-p-delete-fix' into maint
2009-12-08
Jeff
King
a
dd-intera
c
tive: fix de
l
etion of non-empty files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
reset: im
p
rove wor
k
tree
sa
f
ety valve
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
r
e
rere: d
o
n't segfau
l
t o
n
failure
to
open rr-cache
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-24
J
e
ff King
prune-pa
c
ked: only show pr
o
gress wh
e
n
s
tderr is a
t
ty
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-16
Jeff King
diffcore-break: sa
v
e cnt_data
f
or other ph
a
ses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-16
Je
f
f Kin
g
d
i
f
f
c
ore-b
r
eak:
f
r
e
e fil
e
spec data as we g
o
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-09
Jeff King
form
a
t-
p
atc
h
: make "-p" su
p
press
di
f
fstat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
J
e
ff King
push: fix
t
y
po in
u
s
age
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
Jeff King
ls-
f
i
l
es: unbreak "ls-files -i"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-28
Jeff Ki
n
g
a
d
d-interactive: handle delet
i
on of empty fi
l
es
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-26
Jeff
K
i
ng
push: always load default config
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-19
J
e
f
f
King
c
v
s
imp
o
rt
:
f
i
x
relat
i
ve argument file
n
a
m
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-19
Jeff K
i
n
g
document push's new quiet op
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-12
Jeff Ki
n
g
l
s-files: excludes should
n
ot impac
t
t
r
ac
k
e
d
f
il
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-09
Jeff King
pu
l
l:
improve advi
c
e
for unconf
i
gured error c
a
s
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-29
Jeff Kin
g
imp
r
ov
e
reflog dat
e
/number heuris
t
ic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jef
f
King
r
e
base: use pl
u
mbi
n
g
to s
h
ow d
i
rty st
a
te
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jeff King
st
a
tus: make "ho
w
to stage" messages option
a
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jeff King
pus
h
: make non-fast-
f
orward hel
p
mess
a
ge configurable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Je
f
f King
push: re-f
l
ow n
o
n-f
a
st
-
forward message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
push: fix english in no
n
-fast-
f
orwar
d
me
s
sage
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-03
Jeff King
pus
h
: teach --quiet to
s
upp
r
ess "Ev
e
rything
up
-
to-d
a
te"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-03
Jeff
King
clone: dis
c
o
nnect trans
p
ort
a
fter fe
t
ching
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jeff King
f
i
x approx
i
date
p
arsing of relative months an
d
years
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jeff Kin
g
t
e
sts:
add
dat
e
p
r
i
n
ting and parsing tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jef
f
King
refactor t
e
st-date interfa
c
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-27
Jeff King
clone: add
-
-branch
optio
n
to select a different HEAD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-25
J
e
ff King
checkout: do
not imply "-f" on unbo
r
n
b
ranches
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-18
J
eff Ki
n
g
tests
:
disable int
e
r
acti
v
e hunk selection tests
i
f
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-17
Jeff Ki
n
g
docs: des
c
r
i
be impact of
r
epack on "clone -s
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-12
Jeff King
a
l
low pu
l
l -
-
rebase on branch yet
to be born
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
merge: indicate remote tracking b
r
anches i
n
merge message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff Kin
g
merge: fix incor
r
ect merge mes
s
age for ambiguous tag
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Je
f
f Kin
g
add t
e
sts
for merg
e
mess
a
g
e
headings
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff Kin
g
t/
M
akefile: incl
u
de con
f
i
g
.
m
a
k
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
t
e
s
t
s: a
l
low user to spe
c
ify trash
d
i
rectory location
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
tests: provide $TRAS
H
_D
I
REC
T
ORY
v
a
riable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Je
f
f
K
i
n
g
tests
:
use "$T
E
ST_DIRECTORY" ins
t
ead
of "
.
.
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-07
Jeff King
Make
f
il
e
: git-http
-
fetch d
o
es n
o
t nee
d
expat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
J
e
f
f King
tran
s
port: don
'
t show
push status if --
q
uie
t
is
g
i
ven
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
Jeff Ki
n
g
tra
n
spo
r
t: p
a
ss "quiet" flag to pa
c
k-objects
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
Jeff
King
push: add -
-
quiet flag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-24
J
e
f
f
King
send-email: detect
c
ycles i
n
alias expansion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-19
J
eff King
show: add space between multi
p
le items
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
s
how
:
suppress extra newline when
showing annotate
d
tag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-09
Jeff King
Make
f
i
l
e: instal
l
'git' in execd
i
r
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-01
Jeff
K
ing
log-
t
ree:
fix con
f
using co
m
ment
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-06-18
Jeff K
i
ng
Makefile:
u
s
e comp
a
t
r
ege
x
on Solari
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-06-18
J
eff Ki
n
g
Makefile:
r
efactor regex co
m
pat s
u
pp
o
rt
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-31
Jeff King
git-add: no n
e
ed for
-f when reso
l
ving a
c
onflict
i
n
.
.
.
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
fix cat-file usage message and
docu
m
ent
a
tion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
Je
f
f
King
fet
c
h: repor
t
ref storage DF
e
r
rors m
o
re accurately
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
Jeff Ki
n
g
lock_ref: info
r
m c
a
llers of unav
a
ilable ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
Jeff
K
i
ng
conv
e
rt b
a
r
e
r
e
adlink t
o
strbu
f
_readlink
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-20
Jeff King
f
o
r-each-ref
:
f
ix
s
e
gfault in copy_email
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
Jeff
K
ing
add
:
don't complain when ad
d
in
g
empty project ro
o
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
J
e
ff King
fix GIT
_
TRACE seg
f
a
ult with
she
l
l-quoted aliases
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
Jef
f
King
parseopt: add
OPT_NEGBI
T
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-28
Jeff King
M
akefi
l
e: fix
N
O_P
E
RL bug with gitw
e
b
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-24
Jeff King
t7
8
0
0
: respe
c
t
N
O_PERL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-19
Jeff King
add-in
t
eractive: refactor mode hunk
h
andling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-18
Jeff King
doc/gitattribut
e
s: clarify lo
c
atio
n
of
config
te
x
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-16
J
e
ff
King
add-
i
n
teractive: refactor mode
h
u
nk handling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff Ki
n
g
docs/
c
hec
k
o
u
t: clarify wh
a
t
"
non-branc
h
" means
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff King
do
c
/che
c
k
o
ut: split
c
heckout and b
r
anch creati
o
n
i
n
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff King
doc/c
h
eckout: refer to
git-branch(1
)
as
a
ppro
p
r
i
ate
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jef
f
King
doc: refer to tracking configuratio
n
as "upstream"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff King
doc: c
l
arify --n
o
-track opt
i
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
J
e
f
f King
add te
s
ts for
remote
g
roups
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Jeff King
tests
:
skip pe
r
l tests
i
f NO_
P
ERL is
d
efined
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Jeff King
Makefi
l
e:
allow bu
i
lding with
o
ut perl
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
branch: sho
w
upstr
e
am branch
when double verbose
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
make get_sho
r
t_
r
ef
a
p
u
b
lic func
t
i
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
for-each-
r
ef:
add "upstream" f
o
rmat
f
ield
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
J
e
f
f
King
for-each-ref: refactor refn
a
m
e
h
andling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Je
f
f
King
for-ea
c
h-ref: refactor get_s
h
o
r
t
_ref func
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-05
Jeff
K
ing
te
s
ts: remove exit afte
r
test_do
n
e
c
a
ll
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-05
Jeff K
i
n
g
commit: abor
t
com
m
it if interactive add
faile
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-01
Jeff
K
ing
t
1
301: lo
o
sen test for f
o
rced modes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-01
Jeff
King
fix
p
or
t
ability problem with IS_RUN_C
O
MMAN
D
_E
R
R
commit
|
commitdiff
|
tree
2009-03-23
Jeff Kin
g
t
0
060: fi
x
whitesp
a
ce in "wc -c" invo
c
atio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-23
J
eff King
Makefil
e
: turn on U
S
E
_ST_TI
M
ES
P
EC
f
or F
r
eeBSD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-22
J
e
ff King
r
e
m
ote: imp
r
o
v
e
s
o
r
tin
g
of "config
u
re for git push
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-22
Jeff
K
ing
ls-fil
e
s
:
require
wo
r
ktr
e
e wh
e
n --
d
e
l
et
e
d
is given
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-20
J
e
ff King
mak
e
o
n
eline reflog d
a
tes
mor
e
co
n
s
i
s
tent with
mul
t
iline
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-19
Je
f
f King
d
o
c: clari
f
y how
-
S works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-17
J
eff King
ls-f
i
le
s
:
require
worktree when --delet
e
d is give
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-08
Jef
f
King
ls-files: f
i
x
b
roken --no-empty-direc
t
or
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-08
J
e
ff Ki
n
g
t3000: use
t
est
_
cmp i
n
stead
of diff
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff King
document config -
-
bool-or-int
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff King
config: s
e
t
hel
p
text fo
r
--bool-or-int
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff
K
ing
t13
0
0: use te
s
t
_
m
ust_f
a
i
l
as appro
p
r
i
ate
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-05
Jeff
King
i
m
prove missing repo
s
itory error mes
s
ag
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-03
J
e
ff King
clone
:
run
p
ost-che
c
k
o
u
t hook when check
i
ng out
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-27
J
e
ff King
remo
t
e: make guess_remote_head(
)
use exact HEAD lookup
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
Jeff King
refactor find_
r
e
f_by_
n
a
me() to
accept cons
t
list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
Je
f
f K
i
ng
a
dd basic http clo
n
e/fetch t
e
sts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
Jeff King
t
es
t
scr
i
pts
:
refactor
s
ta
r
t_h
t
tpd helper
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-25
Jeff King
n
ever fallback
r
elative tim
e
s
t
o a
b
solute
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-19
J
eff Kin
g
a
d
d
basic
branch d
i
splay t
e
sts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next