repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'cb/maint-no-double-merge' into maint
2009-05-25
J
e
ff K
i
ng
fix cat-file
usage message and documentation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
Jef
f
Kin
g
fetch: report ref stora
g
e DF err
o
rs more
a
ccuratel
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
J
eff King
lock
_
ref: inf
o
rm callers of unavailable ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-20
Jeff King
for-each
-
re
f
: fix seg
f
a
ult i
n
c
o
py_email
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
Jeff King
add: don't
c
o
mplain w
h
en addin
g
em
p
ty pro
j
ect
r
o
ot
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
Jeff
K
ing
f
ix GIT_TRACE segfault with shell-quoted alia
s
es
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-28
Je
f
f King
Makefile:
f
ix
N
O_PERL bug with
gitweb
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-24
J
e
f
f
K
ing
t
7
800: resp
e
ct NO_PER
L
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-19
J
e
ff K
i
ng
add
-
i
n
t
e
ractiv
e
:
refactor mode
hunk hand
l
i
n
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-18
Jeff King
doc/gitattributes: clarify location of co
n
fi
g
text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-16
Je
f
f Ki
n
g
add-interactive: refactor mode
h
u
nk handl
i
ng
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff King
d
ocs/chec
k
ou
t
: clarify
w
ha
t
"
n
o
n-bran
c
h" means
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff King
do
c
/chec
k
out
:
split che
c
kout and branc
h
cr
e
ati
o
n
in
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff King
do
c
/
c
hecko
u
t: refe
r
to
g
it-branch(1) as appropriate
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff King
doc:
refer to
tr
a
c
k
ing config
u
ration as
"
upstream"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Je
f
f K
i
ng
d
oc: cl
a
rif
y
-
-
no-track option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Je
f
f King
a
d
d te
s
ts for re
m
ote groups
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Jeff K
i
ng
tes
t
s: skip
perl tests if N
O
_
PERL is defined
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Jeff Ki
n
g
Ma
k
efile: all
o
w
building without perl
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
br
a
nch: sh
o
w upstream branch when double verbose
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff Kin
g
make
g
et_short_ref a
public
f
unction
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
f
o
r-each-r
e
f
: add "upstream" format fie
l
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Je
f
f King
fo
r
-each-ref: re
f
a
c
to
r
ref
n
ame handling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff Kin
g
f
or-ea
c
h-ref: re
f
actor get_short_ref funct
i
on
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-05
Jeff Ki
n
g
test
s
: remove exit
after
t
est_done call
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
commit: a
b
ort commit if interactive add failed
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-01
Jeff Kin
g
t1301: lo
o
sen
t
est for forced m
o
des
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-01
J
e
f
f
Ki
n
g
fix
portability problem with IS
_
RUN_COMMAND_ERR
commit
|
commitdiff
|
tree
2009-03-23
J
e
ff King
t0060
:
fix whitespace in "
w
c -c" i
n
voc
a
tion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-23
Jeff King
Ma
k
efile: turn on USE_ST_TIMESP
E
C
for FreeBSD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-22
Jeff King
remote: imp
r
o
v
e s
o
rting of "c
o
nfigur
e
for git
p
ush
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-22
Jeff
K
in
g
l
s
-fi
l
es: require w
o
rkt
r
e
e w
h
en
--del
e
ted
is give
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-20
Jef
f
King
make one
l
i
ne reflog
d
ates
more c
o
nsistent
w
i
th multil
i
ne
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-19
Jeff Kin
g
doc: clarify how
-
S
works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-17
Jeff Kin
g
ls-files: require worktr
e
e when --
d
e
l
eted is given
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-08
Jeff Ki
n
g
l
s-fil
e
s
: fi
x
broken --no-empty
-
directory
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-08
Jeff King
t3000:
u
s
e
t
e
st_cm
p
ins
t
ead of diff
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff King
docum
e
n
t
co
n
f
ig -
-
bool-
o
r
-
in
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff King
config:
set
h
e
l
p
t
ext
for
-
-bool-
o
r-int
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff
Kin
g
t1300: use
test_must_f
a
il a
s
approp
r
iate
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-05
J
e
ff King
imp
r
ove
m
issin
g
r
e
posi
t
ory
e
r
r
o
r
m
essa
g
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-03
Jef
f
King
clone:
r
u
n
p
o
s
t-chec
k
o
ut
h
ook
w
hen checking out
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-27
Jeff King
remote:
m
ake guess_re
m
ote_
h
ead() use exact HE
A
D lo
o
kup
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
Jeff King
refactor find
_
ref_by_name()
t
o
ac
c
e
p
t const list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
Jeff King
add ba
s
ic
h
ttp clone/f
e
tch te
s
t
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
Jeff
K
ing
t
e
s
t scripts: refactor star
t
_httpd helpe
r
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-25
Jeff King
nev
e
r fal
l
back relat
i
ve times to
a
bsolute
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-19
Jeff
King
add basic
b
ranch d
i
splay tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-19
Jeff King
b
ranch: clean up
repeated strlen
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-14
Jeff King
symbolic-re
f
: allow refs/
<
whatever
>
in HE
A
D
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-04
J
e
f
f
K
ing
valgri
n
d
:
ignore ldso and more l
i
bz errors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-30
Jeff King
t000
5
: use SIGTE
R
M
for sigc
h
ain test
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-29
Jeff King
s
y
mboli
c
ref: refuse non-ref targets in HEAD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-29
Jeff King
valid
a
te_headref: tighten r
e
f-ma
t
ching t
o
just branch
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-29
Jeff King
avoi
d
31-bit
truncation in writ
e
_
l
oose_obje
c
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-28
J
eff King
git: us
e
run_command() to execute das
h
ed ext
e
r
n
als
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-28
Je
f
f
King
run_comma
n
d(
)
:
h
elp cal
l
ers
d
isti
n
guis
h
errors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-28
Jeff
King
run_command(): handle missing command e
r
rors more gracefully
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-28
Jeff
K
ing
g
i
t:
s
/
run_command/run_bui
l
t
i
n/
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-22
Jeff
King
pager: do wait_
f
o
r_pager on signal d
e
ath
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-22
J
eff King
refact
o
r signal
h
a
ndli
n
g for c
l
e
anup fu
n
ction
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-22
Je
f
f Kin
g
chain kil
l
signals for cleanup functions
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-22
Jef
f
King
di
f
f
: refacto
r
t
e
mpfile cleanup handling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-18
Jeff King
exp
a
nd --pr
e
t
t
y=for
m
at
c
olor options
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-18
Je
f
f
K
ing
c
olor: make it easier for non
-
config to parse color
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-11
Jeff Ki
n
g
M
a
kefile: cle
a
n up T
E
S
T
_
PROGR
A
M
S definition
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-11
Je
f
f King
rebase: improv
e
error me
s
sages about dirty st
a
te
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
diff: respect textconv in rewrit
e
diffs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
diff:
fix
han
d
l
i
n
g of binary
r
ewrite diffs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-08
Jeff King
diff:
allow turn
i
ng on textconv explicitly for plu
m
bing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-08
Jeff Ki
n
g
reord
e
r
A
LLOW_TEX
T
CONV op
t
ion setting
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-07
Jeff King
t
a
g: delete T
A
G_EDITMS
G
only
on successful tag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-04
Jeff King
add stage to
g
itignore
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-12
Jeff Kin
g
stat
u
s: show "-v" diff even fo
r
initial comm
i
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-12
Jeff K
i
ng
co
m
mi
t
:
F
ix s
t
rip
p
ing of patc
h
i
n verbo
s
e mode
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-12
Jeff
King
wt-sta
t
us: refactor initi
a
l commit printing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-12
Jeff King
def
i
n
e
empty tre
e
sha1 as a macro
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-09
Jeff King
receive-
p
ack: detect pus
h
to curr
e
nt branch o
f
no
n
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-09
Jef
f
Ki
n
g
t5516
:
refactor oddb
a
ll
t
ests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-09
Jeff King
t
5
400: expect s
u
cce
s
s
for d
e
ny
i
ng
d
eletio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-02
Jeff K
i
ng
send-pa
c
k: do not se
n
d
o
ut
s
ingle-level refs su
c
h as
.
.
.
commit
|
commitdiff
|
tree
2008-11-02
Jeff King
fix overlapping
m
emcpy in normalize_abso
l
ute_path
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-02
Jeff Kin
g
p
a
ck-o
b
jects
:
av
o
id read
i
ng unin
i
talized dat
a
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-02
J
e
ff King
correct cache_entry allocation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Jeff King
e
nable
t
ex
t
c
onv f
o
r diff in v
e
rbose statu
s
/co
m
mit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
J
e
f
f King
a
d
d
use
r
diff textconv
t
e
sts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Jeff King
wt
-
status: load
diff ui
c
onfig
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Jef
f
King
only textc
o
nv regular files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Jef
f
K
i
ng
userdiff: requi
r
e explicitly allowing textconv
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
J
eff King
refact
o
r userdiff textconv code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Jeff Kin
g
docum
e
nt the diff driver textconv featur
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
J
e
ff Ki
n
g
diff: add missing stat
i
c dec
l
arati
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-23
Jeff Ki
n
g
su
b
m
o
dule: fix some non-portab
l
e grep invoc
a
ti
o
ns
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-23
Jeff King
rm: loosen safety valve f
o
r
e
mpty files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-21
Jeff King
document "int
e
nt
to add" op
t
ion to git-add
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-18
J
e
ff
K
i
ng
d
iff: add filter for convertin
g
binary to
t
e
x
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-18
Jeff Kin
g
diff: int
r
oduce diff
.
<driver>
.
binary
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-18
Jeff King
d
i
ff: uni
f
y external
d
i
f
f
and
fu
n
cname par
s
ing cod
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-18
Jeff
K
ing
t4012: use
t
e
s
t
_cmp instead of cmp
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-17
Jeff
K
ing
refactor handling of "other" files
in ls-files and
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next