repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Remove filename from conflict markers
2009-07-01
Jeff Ki
n
g
log-tree
:
f
i
x c
o
nfusing co
m
ment
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-31
Jeff King
gi
t
-a
d
d: no
n
eed for
-f wh
e
n resol
v
ing
a conflict in
.
.
.
commit
|
commitdiff
|
tree
2009-05-25
Jeff
King
fix ca
t
-file
u
sage me
s
sage and
documentati
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
fetch: rep
o
r
t
ref storage DF er
r
ors more accurately
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
loc
k
_
r
ef: inform callers
of unavailable ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
J
eff King
convert b
a
re
readlink to strbuf
_
readlink
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-20
Jeff King
for-ea
c
h
-
ref: fix segf
a
ult in
c
opy
_
e
m
a
il
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
Je
f
f
K
ing
add: don't
c
omplai
n
whe
n
addin
g
empty
pr
o
j
e
ct root
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
J
eff King
fix G
I
T
_TRACE seg
f
ault
with shell-quoted
alia
s
es
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
Jeff King
parseopt: add O
P
T
_
NEGBIT
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-28
Jeff King
Makefile: fix N
O
_PERL bug with gi
t
we
b
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-24
Jeff Kin
g
t7800: res
p
ec
t
NO_PERL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-19
J
eff
King
add-intera
c
tiv
e
: refactor mo
d
e hu
n
k
handling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-18
Jeff King
doc/gitattributes: clarify location of
c
o
n
fig text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-16
Jeff
King
add-int
e
ractive: refac
t
or
m
ode
h
u
n
k handling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff Kin
g
docs/checkout:
clar
i
fy what "non-br
a
nch" means
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff King
doc/checkout: split che
c
kout and branch creation in
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff King
doc/check
o
ut
:
refe
r
to git-br
a
n
c
h(
1
) as appropriate
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff King
doc:
r
efer to tracking configu
r
at
i
on as "upstream"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff King
d
o
c: c
l
arify --no-track option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Je
f
f Ki
n
g
add t
e
st
s
for
r
e
m
ote groups
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Jeff
King
t
ests: sk
i
p perl tests if
NO_P
E
RL
i
s defined
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Jeff
King
Makefile
:
allow buildi
n
g w
i
thout
perl
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
J
ef
f
Kin
g
branch: show upstream branch w
h
en double verbose
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff Ki
n
g
mak
e
get_short_ref a publi
c
function
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
J
e
f
f King
fo
r
-each-ref: ad
d
"
u
p
stre
a
m" f
o
r
ma
t
field
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff K
i
ng
for-ea
c
h-ref: refactor refna
m
e ha
n
d
l
ing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff
K
ing
for-e
a
ch-r
e
f: refactor get_shor
t
_ref functi
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-05
Jeff K
i
ng
tests: remove exit after test_done cal
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
c
ommi
t
:
a
bort co
m
mit if in
t
e
ractiv
e
add fai
l
ed
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-01
Jeff
K
ing
t1301: loosen te
s
t for forced m
o
des
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-01
J
e
ff King
fix portability problem with IS_RUN_COMMAND_ERR
commit
|
commitdiff
|
tree
2009-03-23
Jef
f
King
t0060: fi
x
whitespace i
n
"wc -c
"
invoc
a
ti
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-23
J
e
ff King
M
ak
e
file:
t
urn on USE_ST
_
TIMESPEC
f
o
r FreeB
S
D
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-22
Jeff King
remote
:
improve sorting of
"con
f
i
g
u
re for
g
it pus
h
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-22
Jeff King
ls-file
s
: r
e
q
u
i
re work
t
r
ee when
--deleted is
g
i
ven
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-20
Jeff King
make oneline
reflog date
s
m
ore consi
s
tent with m
u
ltiline
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-19
Jeff K
i
n
g
doc: clarify how
-S works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-17
Jeff K
i
ng
l
s-files:
r
equ
i
re worktre
e
w
h
en --deleted
is give
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-08
Jeff King
ls
-
files: fix broken --no-empty-directory
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-08
J
e
ff
K
ing
t3000: use te
s
t_cmp instea
d
o
f dif
f
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff King
document con
f
ig
--bool-or-int
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff Kin
g
config
:
set
help
text f
o
r --bool-
o
r-int
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff King
t
1300: use test_mus
t
_f
a
il as ap
p
ropriate
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-05
J
e
ff King
improve mis
s
ing repository
e
rr
o
r messag
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-03
J
e
f
f Ki
n
g
clo
n
e: run post-checko
u
t
hook wh
e
n checking o
u
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-27
J
e
ff King
remote
:
m
ake gues
s
_remo
t
e_head() us
e
exact HEAD lookup
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
Jeff
King
re
f
act
o
r find_ref_by_name
(
) to
accept const list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
J
e
ff King
ad
d
basic htt
p
clone/f
e
tch tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
Jef
f
Kin
g
test
scripts:
r
efactor s
t
art_http
d
helpe
r
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-25
Jeff
King
never fallback r
e
lati
v
e
tim
e
s to
a
bsolut
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-19
Jeff King
a
dd basic branch
dis
p
l
ay t
e
sts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-19
Jeff K
i
n
g
branch:
c
lean u
p
repeated strlen
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-14
Jeff King
symbolic-ref: allow refs/
<
whatev
e
r> in
H
E
AD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-04
Jeff
K
i
ng
valgrind:
ignore
l
dso
and mo
r
e
l
i
bz
er
r
ors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-30
Jeff King
t0005: use SI
G
TERM for sigchain t
e
s
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-29
Jeff King
symboli
c
ref: refuse no
n
-ref
t
a
r
ge
t
s in H
E
AD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-29
Jeff King
val
i
date_h
e
a
dr
e
f: t
i
ghten re
f
-matching to jus
t
br
a
nches
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-29
Jeff K
i
ng
avoid 31-bit trun
c
atio
n
in write_loose
_
obje
c
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-28
Jeff King
git: use run
_
c
ommand() to execute dashed e
x
terna
l
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-28
Jeff K
i
ng
run_command(): help calle
r
s disting
u
ish errors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-28
Jeff Kin
g
run
_
command():
handl
e
mi
s
sin
g
comm
a
nd errors more gracefully
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-28
Jeff King
git: s/
r
un_command/run_bui
l
tin
/
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-22
Jeff King
pager: do wait_for_pag
e
r
o
n signal death
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-22
J
e
ff King
refactor si
g
nal handlin
g
for
c
l
e
anup
f
unctions
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-22
Jeff King
chain kill signals f
o
r
c
le
a
nup
fu
n
c
tions
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-22
J
e
f
f Kin
g
diff
:
refactor temp
f
ile cleanup
handling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-18
Jef
f
King
expand
--
p
r
e
tty=fo
r
mat color op
t
io
n
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-18
Jeff
K
ing
color: make it e
a
sie
r
for non-config to parse c
o
lor
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-11
Jef
f
King
M
a
kefile: cl
e
an
u
p
TEST_PR
O
GRAMS
d
efinitio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-11
Jeff King
re
b
ase:
i
mprove error messages ab
o
u
t dirty stat
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-10
Je
f
f King
diff: respect text
c
onv
in r
e
writ
e
diffs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-10
Je
f
f King
diff: fix
h
andling of binary rewrite
d
iffs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-08
Jeff King
d
i
ff: allow turn
i
ng on textconv explicitly for plumb
i
ng
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-08
Jeff King
reor
d
e
r ALLOW_TE
X
TCO
N
V option
setting
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-07
Jeff King
tag: dele
t
e TAG_EDI
T
MSG
only on su
c
ce
s
sful tag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-04
Jeff
King
ad
d
stage to gitignore
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-12
Jeff
King
status: s
h
ow "-
v
" d
i
ff even for
i
nitial commit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-12
J
eff King
commit:
F
ix s
t
ri
p
ping of p
a
tch in
verbose
mod
e
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-12
Jef
f
Kin
g
wt-s
t
atus: refacto
r
ini
t
ial
commit printing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-12
J
eff King
define
e
mp
t
y tree sha1 a
s
a macr
o
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-09
Jeff Ki
n
g
receive
-
pack: detect push
t
o curr
e
nt branch
of
n
on
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-09
Jeff King
t5516: r
e
facto
r
o
d
dball tes
t
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-09
Jeff King
t5400
:
ex
p
ect su
c
ce
s
s f
o
r
denying deletion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-02
Jeff King
send-pack: do not send out single-l
e
vel refs su
c
h as
.
.
.
commit
|
commitdiff
|
tree
2008-11-02
J
e
ff Kin
g
fix
overlapping
memcpy
in normalize_absolute_path
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-02
Jeff
K
ing
pack-objects: avoid r
e
a
ding
u
ninitalized data
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-02
Jeff King
c
o
rrect cache_entry allocation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
J
eff
K
ing
enable textconv for diff in verbose st
a
tus/com
m
it
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
J
eff
Ki
n
g
add u
s
e
rd
i
ff
t
extconv tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Jeff King
wt-status:
l
o
ad diff ui config
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Jeff King
o
n
ly textc
o
n
v
regular
f
iles
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
J
e
ff King
userdiff
:
require explicitly a
l
lowing tex
t
con
v
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Jeff King
r
efac
t
or userdiff textconv
c
ode
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
J
e
f
f
King
doc
u
ment
th
e
diff driver textconv fe
a
tu
r
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Jeff King
diff: add mis
s
in
g
static
de
c
laration
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-23
Jeff K
i
n
g
s
ubmodule: fix so
m
e non-po
r
table grep i
n
v
o
cation
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-23
Jeff King
rm
:
loosen s
a
fety valve for empty f
i
les
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-21
J
e
ff Ki
n
g
document
"
inten
t
to
a
dd"
option to 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
next