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
Jef
f
King
git-add: no need for -f when resolv
i
ng a
c
onf
l
i
c
t
i
n
.
.
.
commit
|
commitdiff
|
tree
2009-05-25
J
eff Kin
g
fix
c
at-file us
a
g
e mes
s
age and documenta
t
i
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
f
e
tch
:
r
e
port ref storage
DF errors
more
a
ccurately
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
Jeff
K
in
g
lock_ref:
i
nform call
e
rs of unavailable re
f
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
Jeff K
i
n
g
conv
e
r
t
bare rea
d
link to strb
u
f_readlink
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-20
Jeff Ki
n
g
fo
r
-each-ref: f
i
x seg
f
ault in copy_ema
i
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
Jeff K
i
n
g
add: don't
c
omplain when
a
ddi
n
g
empty
p
r
oject
r
oot
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
Jeff K
i
ng
fix GIT_TRACE
se
g
fault with shell-quoted
a
liases
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
Jeff
King
parseopt: add OPT
_
NEGBIT
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-28
Jeff King
Makefil
e
: fix NO_PERL bug wi
t
h
gitwe
b
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-24
J
eff King
t7800:
r
espect NO_PERL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-19
Jeff Kin
g
add-interactive: r
e
factor
m
od
e
h
unk handling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-18
J
eff King
doc/gita
t
trib
u
tes: clar
i
fy lo
c
ation of config
text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-16
J
e
f
f King
a
d
d-interactive: refactor mo
d
e hunk h
a
ndling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff Ki
n
g
docs/che
c
kout:
c
larify wh
a
t "n
o
n-branch"
means
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jef
f
King
d
oc/checkout: split
check
o
ut and branch creation in
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jef
f
King
doc/checkout:
refer
to
git-br
a
nch(1) as appropriat
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff Kin
g
doc: refe
r
to tracking configuration as "upstr
e
am"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Je
f
f King
doc: clarify --no-track option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
J
e
ff King
add tes
t
s
for
r
e
mote groups
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
J
eff King
tes
t
s: skip p
e
rl tests if NO_PERL is
de
f
ined
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Je
f
f King
Ma
k
ef
i
le: allow building wi
t
hou
t
p
e
rl
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff
K
ing
branch:
show upstream br
a
nch when double verbose
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
m
ake
g
e
t
_
short_ref a public function
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jef
f
Ki
n
g
for-
e
ach-re
f
: add
"
upst
r
eam" format field
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff
King
for-ea
c
h-
r
ef: refactor
refname handling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff K
i
n
g
for-each-ref: refactor
get_sho
r
t_ref f
u
nct
i
on
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
tes
t
s
:
remove exit after test_done
c
all
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
commit:
abort commit
if inte
r
a
c
tive
add failed
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-01
Je
f
f King
t
1
301
:
loosen test for
f
orced m
o
des
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
f
i
x portability problem with IS_RU
N
_COMMAND_ERR
commit
|
commitdiff
|
tree
2009-03-23
Jeff King
t0060: fix whitespace
i
n "wc
-c" invocation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-23
Jeff Kin
g
Ma
k
efile: turn o
n
U
S
E_ST_TIMES
P
EC
fo
r
FreeBSD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-22
Jeff Kin
g
remote:
i
m
pr
o
ve s
o
r
t
ing
of
"
configure for git push
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-22
J
e
f
f
King
ls-fil
e
s: require worktree when --deleted is given
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-20
Jeff King
make onel
i
n
e reflog
da
t
es
mor
e
consistent w
i
t
h
mult
i
l
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
ls-files: require
wo
r
ktree w
h
en --deleted
i
s
g
i
ven
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-08
Jeff K
i
ng
ls-fil
e
s
:
fix bro
k
en -
-
n
o
-empty-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
i
ff
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff King
docu
m
ent co
n
fig --bool-or-int
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Je
f
f
King
config:
s
et help text for --bool-or-int
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff King
t
1
300: use test_mus
t
_fail
a
s
appropriate
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-05
J
eff King
imp
r
o
v
e missing repository error message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-03
Je
f
f
Ki
n
g
c
l
one: run post-check
o
ut hook whe
n
checking out
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-27
Jeff Ki
n
g
re
m
ote: make gue
s
s_rem
o
te_head() use exact HEAD lo
o
kup
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
J
eff King
ref
a
ctor find_ref_by_name() to ac
c
ept con
s
t
l
is
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
J
eff King
add
basic http clone/f
e
tch tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
Je
f
f King
test scr
i
pts:
refactor start_httpd
h
elper
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-25
Jef
f
King
never fallbac
k
relative t
i
mes to
a
b
s
o
lute
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-19
Jef
f
King
add bas
i
c
branch disp
l
ay tes
t
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-19
Jeff Kin
g
bran
c
h:
cle
a
n up repeated strle
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-14
Jeff King
symb
o
lic-ref: allow refs/<whatever> i
n
HEAD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-04
Jeff
K
ing
v
algrind: ignore
l
dso and
m
o
r
e libz er
r
ors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-30
Jeff King
t0005
:
use SIGTERM f
o
r sigchain test
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-29
Jeff King
symbolic ref
:
refuse
n
o
n-ref targets in HEAD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-29
J
e
ff King
validat
e
_headref
:
tighten ref-
m
atching to just branches
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-29
Jeff
K
i
n
g
avoid 31-
b
it truncation in
write_loose_object
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-28
Jeff King
gi
t
:
use run_comm
a
n
d() to execute d
a
shed ext
e
rnals
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-28
J
eff Ki
n
g
r
un_command():
help cal
l
ers distinguish e
r
rors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-28
J
e
ff King
ru
n
_command(): h
a
ndle missi
n
g c
o
mmand err
o
rs more gracef
u
lly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-28
Je
f
f
King
g
i
t: s/r
u
n_comman
d
/run_builtin/
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-22
J
e
f
f
King
p
ager: do wait_for
_
pager
o
n signal
d
eath
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-22
Jef
f
Ki
n
g
refactor sig
n
al handling for cleanu
p
fu
n
ctions
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-22
Jeff
K
ing
chain
kill sig
n
als for
c
leanup
f
unctions
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-22
Je
f
f Ki
n
g
d
i
ff: refactor t
e
mpfile cle
a
n
u
p handling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-18
Jeff K
i
n
g
expand --prett
y
=format col
o
r o
p
t
i
o
n
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-18
Jeff King
colo
r
: make
it easier for non-config
to p
a
rs
e
color
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-11
Jeff
King
Makefile:
c
lean up
T
EST_PR
O
GRAMS definition
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-11
Jeff K
i
ng
rebase
:
improve error messages about dirty state
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-10
Je
f
f King
diff: res
p
ect textconv
in rew
r
ite diffs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
diff: fix han
d
ling of binary rewrit
e
d
iffs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-08
Jeff King
di
f
f: allow t
u
rning on
t
extcon
v
expli
c
itly for plumbing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-08
J
eff
K
i
n
g
re
o
rder AL
L
O
W
_T
E
XT
C
ONV op
t
ion set
t
ing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-07
Jeff King
ta
g
: delete
T
AG_
E
D
ITMSG on
l
y
o
n
successful tag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-04
Jeff King
a
dd stage to
g
itignore
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-12
Je
f
f
Ki
n
g
status: show "-v"
diff even for i
n
iti
a
l
c
o
m
mi
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-12
Jeff King
commit: Fix stripping of
p
atch in ve
r
bose
mo
d
e
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-12
Jef
f
King
wt-status:
r
e
factor
in
i
tial c
o
mmit pr
i
n
t
ing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-12
Je
f
f King
define empt
y
t
r
ee
s
ha
1
as a ma
c
ro
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-09
J
e
f
f King
r
e
ceive-
p
ack
:
detect push to
c
u
rrent branch of non
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-09
Jeff Kin
g
t
5
51
6
: r
e
factor oddball
t
ests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-09
Jeff King
t5400: expect success for denying deletion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-02
Je
f
f King
send-pa
c
k: do n
o
t send ou
t
sin
g
le-level refs such as
.
.
.
commit
|
commitdiff
|
tree
2008-11-02
Je
f
f
K
in
g
fix over
l
a
pping memcpy i
n
normalize
_
abso
l
u
t
e_path
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-02
Jeff King
pa
c
k-objects: av
o
id rea
d
ing uninita
l
ized d
a
t
a
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-02
J
eff Kin
g
co
r
rect
cach
e
_
entry all
o
c
at
i
on
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Jeff King
enable textconv
f
o
r
diff
i
n verbose sta
t
u
s/commit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Jeff King
add u
s
e
r
dif
f
textconv tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Jeff King
wt-stat
u
s:
l
oad
diff ui config
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Jeff Ki
n
g
on
l
y
te
x
tconv
r
egular files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
J
eff
King
userdi
f
f:
require explicit
l
y allow
i
ng textconv
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Jeff King
ref
a
ctor userdiff te
x
tconv c
o
de
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
J
e
ff King
d
oc
u
m
e
nt
the diff driver textco
n
v feature
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Jeff King
d
i
ff: add missing
s
tatic declara
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-23
Jeff King
submodule:
f
ix some non-port
a
ble grep
i
nvo
c
ations
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-23
Jeff King
rm:
loosen safety valve
f
or em
p
ty files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-21
Jeff King
d
o
cume
n
t "
i
ntent to add" option t
o
git-add
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-18
Jeff K
i
ng
diff: add filter for co
n
ver
t
ing binary t
o
text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-18
Jeff King
diff: in
t
roduce diff
.
<d
r
ive
r
>
.
bi
n
a
r
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next