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-recursive: demonstrate an incorrect conflict with submodule
2009-08-09
Jeff
K
i
n
g
add
t
e
sts f
o
r
m
erge messa
g
e headings
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
t/Makefile:
i
nc
l
ude
c
onfi
g
.
ma
k
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Je
f
f Kin
g
t
e
sts: allow user
t
o
s
pecify trash
directory loca
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
J
eff King
t
e
sts: provide
$TRA
S
H_DIRECTORY var
i
able
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
test
s
: use
"$TEST_DIRECTORY" inst
e
ad of "
.
.
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-07
J
ef
f
King
Make
f
ile:
git-http-fetch d
o
es not need
expat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
Jeff
King
tr
a
ns
p
ort: do
n
't show push
status if --quiet is given
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
Jef
f
King
tran
s
p
o
rt:
p
ass "quiet
"
flag to pa
c
k-
o
b
j
e
c
ts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
J
e
f
f King
push:
add --quiet
flag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-24
Jeff Kin
g
s
end-e
m
ai
l
: detect cycles in alias expansion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-19
Jeff King
show: add
space between multiple
i
t
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
show:
suppress extra
n
ew
l
ine when sho
w
i
ng
annotated tag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-09
Jeff Kin
g
Ma
k
e
file: install 'git' in e
x
ecdir
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-01
Jeff King
log-t
r
ee: fix conf
u
sing comment
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-06-18
Jeff King
Makefi
l
e
:
u
s
e compat regex on Solaris
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-06-18
Jeff
King
Makefi
l
e
:
refact
o
r re
g
e
x comp
a
t sup
p
ort
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-31
J
e
f
f
K
ing
git-add
:
no need f
o
r -
f
when reso
l
vi
n
g a
c
onf
l
ict in
.
.
.
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
fix cat-file usage mes
s
a
g
e
and d
o
c
u
mentation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
J
eff King
fetch
:
re
p
o
r
t ref storag
e
D
F errors more accurately
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
Jeff
K
ing
lock_ref: infor
m
c
a
llers of unav
a
ilab
l
e
ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
conv
e
rt b
a
re r
e
adlink to
s
tr
b
uf_readlink
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-20
Je
f
f King
for-each
-
re
f
: fix
segfault i
n
copy_email
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
J
eff King
add: don't
complain when a
d
ding empty
project roo
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
Jeff King
fix
G
IT_TRACE segfaul
t
w
ith
s
hell-q
u
oted aliase
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
Jeff K
i
ng
parseopt: add OPT_NEG
B
IT
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-28
J
e
ff Ki
n
g
Makefile
:
f
i
x NO_PERL bu
g
with gitweb
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-24
Jeff King
t
7800:
r
espect NO_PE
R
L
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-19
Je
f
f King
add-inte
r
ac
t
ive: refactor mode h
u
nk
h
an
d
ling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-18
Jeff K
i
ng
d
oc/gitatt
r
ibutes: clarify location o
f
config text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-16
J
eff King
add-interactive:
r
efactor
m
ode hunk handling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff
K
i
ng
d
o
cs/check
o
ut: cla
r
ify w
h
at "non-b
r
anch" means
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff King
doc
/
checkou
t
:
split checkout and br
a
nch creation
in
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jef
f
King
d
o
c/
c
heckout
:
refe
r
to git-branc
h
(1
)
as appropriate
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
J
e
ff King
do
c
: r
e
fer to t
r
acking conf
i
guratio
n
as
"
upstream"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jef
f
King
do
c
:
c
larify --no-
t
ra
c
k option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Jeff
K
i
n
g
add tes
t
s
f
or
rem
o
te groups
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
J
eff King
te
s
ts: skip perl
tests if NO_PERL is defined
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Jeff King
Ma
k
efile: allo
w
building
wit
h
out perl
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
J
eff King
bra
n
ch: sho
w
upstream branch
w
hen double verbose
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
make get_short_ref a public fu
n
cti
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff Kin
g
f
o
r
-
each-r
e
f:
add "upstream" fo
r
mat field
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
J
e
f
f
Kin
g
fo
r
-eac
h
-
r
e
f: refactor refname handling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
for
-
each-r
e
f: refactor
g
et_short_ref function
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
tests:
r
emove exit after test_
d
one
call
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-05
J
e
ff King
co
m
m
it: abort commit
if interactive add fail
e
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-01
Jeff Ki
n
g
t1301:
l
oosen
t
est for forced modes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
fix portab
i
lity
p
rob
l
em with IS_RUN_COMMA
N
D_ERR
commit
|
commitdiff
|
tree
2009-03-23
Jeff King
t0060: fix whitespace in "
w
c -c" invocation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-23
Jeff
K
ing
Makefile: turn on USE_S
T
_TIMESPEC for
FreeBSD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-22
Jeff
King
remote: im
p
rove sorting of "
c
onfigur
e
f
o
r
git pu
s
h
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-22
Jeff K
i
ng
ls
-
fil
e
s: requi
r
e w
o
rktree
when --de
l
e
t
e
d
is giv
e
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-20
Jeff K
i
n
g
mak
e
on
e
line reflog
d
a
t
e
s more consi
s
tent with multiline
.
.
.
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
Jef
f
King
l
s-f
i
les:
r
equi
r
e worktree
when --del
e
t
e
d is given
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-08
J
e
ff King
ls-file
s
: fix br
o
ken --no-empty
-
di
r
ec
t
ory
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-08
Jeff Ki
n
g
t3000
:
use test_c
m
p instead of diff
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
J
eff King
document confi
g
--b
o
ol-or-int
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff K
i
ng
con
f
ig
:
set help text for --bool-
o
r-int
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff King
t13
0
0: use
t
est_m
u
st_fail
a
s appropr
i
ate
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-05
Je
f
f
King
improve missin
g
reposito
r
y error message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-03
Jef
f
King
clone: run post-chec
k
out ho
o
k when checking out
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-27
Jeff King
remote: make gues
s
_remot
e
_head(
)
use
e
xac
t
HE
A
D lookup
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
Jeff K
i
n
g
ref
a
ctor find_ref_
b
y_name() to accept cons
t
list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
Jeff Kin
g
a
d
d ba
s
i
c http c
l
o
ne/fe
t
ch tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
Jeff
K
i
ng
te
s
t s
c
ripts: refactor start_httpd helper
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-25
Je
f
f King
never
f
allback relativ
e
tim
e
s t
o
absolute
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-19
Jeff King
ad
d
basic b
r
anc
h
display tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-19
Jeff King
branch: clea
n
u
p
repeat
e
d s
t
r
l
e
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-14
Jeff King
s
ymbol
i
c-ref: allow refs/<whatever> in HEAD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-04
J
eff King
valgrind: i
g
n
o
re
ld
s
o and more l
i
bz errors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-30
Jeff King
t0005: use SIGTERM
for sigc
h
ain test
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-29
Jeff
K
ing
symb
o
lic ref: refu
s
e
non-ref targets in H
E
AD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-29
Jeff Ki
n
g
v
alidate_he
a
d
r
ef
:
tig
h
ten ref
-
matching to just
b
r
anches
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-29
Je
f
f
King
avoid 31-b
i
t
t
ru
n
c
a
tion in write_loose_o
b
j
e
c
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-28
Jeff King
git: use ru
n
_command() to execute dashed
exter
n
als
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-28
J
eff
K
ing
run
_
comma
n
d(): h
e
lp ca
l
lers d
i
stinguish err
o
rs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-28
Je
f
f King
run_comma
n
d(): h
a
ndle
m
issi
n
g comman
d
er
r
o
r
s more gracefull
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-28
Jeff King
g
it: s/r
u
n_c
o
mmand/run
_
bu
i
ltin
/
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-22
Jeff
King
pager: do wait
_
f
or_page
r
on
signal
death
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-22
Jeff King
refacto
r
signal
h
andli
n
g for clean
u
p functio
n
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-22
Jeff King
chain kill signals fo
r
cleanup functions
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-22
Jeff
K
ing
d
iff
:
refactor
t
empfile cleanup
handling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-18
J
e
f
f
K
i
n
g
expand --pretty=format color options
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-18
Jeff King
color:
make it easie
r
for non-config
to parse
color
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-11
Jeff
K
ing
M
a
k
efile: cle
a
n up TEST_PROGRAM
S
d
e
f
initio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-11
Je
f
f Ki
n
g
rebase:
improve er
r
or messages
about dirty state
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-10
Jeff K
i
ng
diff:
respec
t
textc
o
nv
in
r
ewr
i
te diffs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-10
Jeff K
i
n
g
di
f
f:
fix handl
i
ng
o
f binary r
e
write di
f
fs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-08
J
eff King
d
i
ff: a
l
low turning on textconv expl
i
citly
f
or
plu
m
bin
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-08
Jeff Kin
g
r
eord
e
r A
L
L
OW_
T
EXTCONV
option setting
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-07
Jef
f
King
tag
:
del
e
te TAG
_
EDIT
M
SG only on successful tag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-04
Jeff King
add
stage to
gitignore
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-12
Jeff King
status: show "-v" diff even
f
or initial
c
omm
i
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-12
Jeff Ki
n
g
co
m
mit
:
Fix stripping
o
f p
a
t
ch in verbo
s
e mode
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-12
Jeff King
wt-status:
re
f
a
c
tor init
i
al
c
ommit printing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-12
J
e
ff King
define empty tree sha1
as a macro
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-09
Jef
f
King
receive
-
p
a
ck
:
detect push to cur
r
ent branch of
non
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-09
Jeff King
t5516: ref
a
c
tor oddball te
s
ts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-09
Jeff King
t5400: expect succes
s
fo
r
denying dele
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-02
J
e
ff Kin
g
sen
d
-pa
c
k:
do
not send out single-level refs s
u
ch as
.
.
.
commit
|
commitdiff
|
tree
next