repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-add: no need for -f when resolving a conflict in already tracked path
2009-05-31
Jeff King
g
i
t
-add
:
no ne
e
d for -f when resolvin
g
a conf
l
ict in
.
.
.
commit
|
commitdiff
|
tree
2009-05-25
Je
f
f King
fix c
a
t-fil
e
u
s
a
g
e
m
e
ssage
and docu
m
e
ntation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
fetch: r
e
port ref stora
g
e DF errors mo
r
e ac
c
u
r
ately
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
J
eff King
l
oc
k
_ref: inf
o
rm cal
l
ers
o
f unavailable
r
ef
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
convert bar
e
readlink t
o
s
t
rbuf_readlink
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-20
Jeff King
fo
r
-e
a
ch-ref:
f
ix
se
g
fault
i
n
c
opy_e
m
ail
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
Jeff King
add: don't co
m
p
l
ain
when adding empty pro
j
ect r
o
o
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
Jeff King
fi
x
GIT_TRACE
s
egf
a
ult
with shell-
q
uoted
a
liases
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
Jeff King
parseopt: add O
P
T_NEG
B
IT
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-28
Jef
f
King
Mak
e
file: fix
N
O_PE
R
L
b
u
g
with gi
t
w
eb
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-24
Jef
f
K
i
n
g
t7800: respe
c
t NO_PERL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-19
Jeff Kin
g
add-interactiv
e
: refactor mod
e
hunk han
d
l
ing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-18
Jeff King
doc/
g
it
a
ttributes: clarify
lo
c
ati
o
n of
co
n
fig text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-16
Jeff King
a
dd-interactive:
r
efactor mode hunk
h
a
n
dling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Je
f
f K
i
n
g
docs/
c
heckout: c
l
arify what "non-bran
c
h" means
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
J
e
ff King
doc/checkout: split checkout
a
n
d branch creation in
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff Kin
g
d
o
c
/
c
h
e
c
ko
u
t: ref
e
r to git-bra
n
c
h(
1
) as appropri
a
te
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff
K
ing
do
c
: re
f
er to tracking configuration
as "upstream"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff King
doc: cl
a
ri
f
y
--no-track option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Jeff
K
i
n
g
add tests
for remote gro
u
ps
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Jeff
King
tes
t
s: s
k
ip perl tests if NO_PERL is def
i
ned
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Je
f
f King
M
a
k
efile: allow building
without perl
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff
K
ing
bra
n
ch: show upstream branch w
h
en double ve
r
b
o
se
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
m
a
ke get_short_ref a
public
f
u
n
ction
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
for-each-ref: ad
d
"upstream" format fi
e
l
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff K
i
ng
f
o
r-each-re
f
:
r
efactor refname
handl
i
ng
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
J
eff K
i
ng
for-e
a
c
h
-
ref: refactor get_short_ref
functio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
tests: remove exit
a
fte
r
test
_
done
c
all
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
commit: abort com
m
it if interactive add
f
ail
e
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-01
Je
f
f King
t1301: loosen
t
est for fo
r
ced
m
odes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-01
Jeff
K
i
ng
f
i
x
portability
problem with IS_RUN_CO
M
MAND_ERR
commit
|
commitdiff
|
tree
2009-03-23
Jeff
King
t0
0
60: fix
whitespace in "wc
-
c" invoc
a
tion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-23
Je
f
f King
Makefile: turn on USE_ST_TIMESPEC f
o
r F
r
eeBSD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-22
J
eff
K
i
ng
remot
e
: improv
e
sorting of "configure f
o
r git push
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-22
Jeff
King
ls-
f
iles: req
u
ire worktree w
h
en -
-
deleted is
g
iv
e
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-20
J
eff King
make one
l
ine reflog dates more consisten
t
with multil
i
ne
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-19
Jeff King
doc
:
clarify how -S works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-17
Jeff King
l
s-files: req
u
ire
w
orktree when --deleted is given
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-08
Jeff King
l
s
-fil
e
s
: fix
b
roken
-
-
no
-
em
p
t
y-director
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-08
Jeff King
t3000
:
use test_cmp instead of
d
iff
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff King
doc
u
men
t
config --bool-
o
r-int
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff Ki
n
g
conf
i
g: set help text for
--bool-or-i
n
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff King
t1300: use te
s
t_mus
t
_fail as appro
p
riate
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-05
Jeff King
improv
e
missing reposi
t
ory err
o
r
message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-03
Jeff King
c
l
one: run post-checkout
h
ook whe
n
c
heckin
g
out
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-27
Jeff King
remote: mak
e
gu
e
ss_remote_head() use e
x
act HEAD lookup
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
Jeff King
refactor find_ref_by_
n
ame() to accept c
o
nst list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
Jeff King
add basi
c
h
ttp clone/fetch tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
Jeff King
test scripts:
r
efactor start_
h
ttp
d
help
e
r
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-25
J
e
f
f Ki
n
g
never fal
l
back
relative time
s
to absolute
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-19
J
e
f
f
K
i
n
g
a
d
d
bas
i
c branch display
t
e
sts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-19
Jeff King
branch: c
l
ean
up repe
a
ted strle
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-14
Jeff King
symbolic-ref: allow refs/<whatever>
i
n HEAD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-04
Jeff King
v
a
l
grind
:
ignore ldso and more libz
e
rrors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-30
Jeff King
t00
0
5: use SIGTE
R
M fo
r
sigchain test
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-29
Jeff King
symbolic ref: refuse non-ref targ
e
t
s
in
HEAD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-29
Jeff King
v
al
i
date_he
a
d
r
ef: tight
e
n ref-matching to just branches
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-29
Jeff King
avoid 31-b
i
t
truncation in writ
e
_loose_object
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-28
Je
f
f King
g
i
t
: use run_
c
o
mmand() t
o
execute dashed externals
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-28
Jeff Kin
g
run_command(): h
e
lp
c
allers dist
i
n
g
uish errors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-28
Je
f
f King
run_c
o
m
m
a
n
d()
:
h
andl
e
mis
s
ing command errors more grace
f
ull
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-28
Jeff King
g
it: s/run_command/
r
un_
b
uiltin
/
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-22
J
e
f
f
King
pager: do wait_f
o
r
_pager on signal death
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-22
Jeff
King
refact
o
r
signal handli
n
g for
cleanup function
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-22
Jeff King
chai
n
kill signals
f
or cleanup functions
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-22
Jeff K
i
ng
diff: ref
a
c
t
or tempfile cleanup hand
l
i
n
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-18
Jeff King
expa
n
d --pretty=format
c
o
l
o
r
options
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-18
J
e
ff Ki
n
g
c
o
l
or: make it easier for non
-
c
onfig to parse
color
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-11
Jef
f
K
i
n
g
Makefile: clean up T
E
ST_PROGRAMS defi
n
ition
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-11
Jeff
K
i
n
g
re
b
as
e
: impr
o
ve error messages about dirty state
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
d
i
ff: respe
c
t
textc
o
nv in rew
r
ite d
i
ffs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
diff: fi
x
handling of binary rewrite d
i
ffs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-08
J
eff King
diff: allow
tu
r
ning on textconv explicitly
for p
l
u
mbing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-08
Jeff King
reorder ALLOW_TEXTCONV optio
n
setting
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-07
Jeff K
i
ng
t
a
g:
delete TAG_EDITMSG
o
nly on successf
u
l tag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-04
Jeff King
a
d
d
s
t
age to g
i
tignore
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-12
Jeff
K
i
ng
status: s
h
ow "-v"
d
i
f
f
even
for initial commit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-12
Jeff King
commit: Fix stripping
of pat
c
h in
v
er
b
o
s
e mo
d
e
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-12
Jeff King
wt-status: refactor in
i
ti
a
l
c
ommit pri
n
t
i
ng
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-12
Jeff King
define empty
tree sh
a
1
a
s a
macro
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-09
Jeff K
i
n
g
rece
i
v
e
-p
a
c
k
: detect push
to curre
n
t branch of non
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-09
Jeff King
t
5516: refactor od
d
bal
l
tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-09
Je
f
f King
t5400: expect success
for
d
e
nyin
g
deletio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-02
J
eff
King
s
end-
p
ack: do not send o
u
t single-le
v
e
l
refs su
c
h as
.
.
.
commit
|
commitdiff
|
tree
2008-11-02
Jeff King
fi
x
overlapp
i
ng mem
c
p
y
in
normalize_absolute_path
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-02
Jeff
King
pack-object
s
:
avoid reading
uninitalized dat
a
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-02
J
eff
K
ing
corr
e
ct ca
c
he_entry alloca
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Je
f
f King
enable textconv for
d
iff in v
e
rbose s
t
a
tus/commit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Jeff
K
ing
add userdiff textconv tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Je
f
f King
wt-status:
load d
i
ff ui conf
i
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
J
e
ff Ki
n
g
o
nly t
e
x
t
conv
re
g
ular
f
iles
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
J
e
ff K
i
ng
userdiff:
r
e
quire ex
p
li
c
itly allowing textconv
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Jeff Ki
n
g
r
e
fac
t
o
r userdi
f
f textconv code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Je
f
f Ki
n
g
do
c
um
e
nt t
h
e diff dr
i
ver textcon
v
fea
t
ure
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Jef
f
King
diff: add missing sta
t
ic declara
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-23
J
e
ff King
su
b
module: f
i
x
some
non
-
po
r
table grep invocations
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-23
J
e
ff King
rm: loosen safety
valve for empty files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-21
Jeff
K
i
n
g
doc
u
ment "intent to add" optio
n
t
o git-add
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-18
Jeff King
diff: add filter for converting binary to text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-18
J
e
ff Ki
n
g
diff: introduce
d
i
ff
.
<driver>
.
bi
n
a
r
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next