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 branch 'maint-1.7.4' into maint
2011-05-27
J
e
ff King
docs: f
i
x some
a
n
tique
e
xample output
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs:
make
sur
e
literal "->" isn't converted to a
r
r
ow
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: u
p
date status --porcelain
f
ormat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jef
f
Ki
n
g
d
ocs: minor grammar fixes
t
o git-sta
t
us
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
read_gitfil
e
_gentl
y
: use
ssize_t
t
o hold read
resu
l
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
conf
i
g
:
always
parse
G
IT_CONF
I
G
_PARAMETERS duri
n
g git_config
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
J
e
ff King
git
_
config: don't peek at global
con
f
ig_parameters
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
config:
m
ake e
n
viro
n
men
t
parsing ro
u
ti
n
e
s
static
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-18
Jeff King
test core
.
gitpro
x
y configuration
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
King
se
n
d
-
pack: a
v
oid deadl
o
ck on git:// push with fa
i
l
e
d
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
c
onnect: let c
a
llers kn
o
w if connection is a
s
o
cket
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
King
conne
c
t: treat generic proxy processes like ssh p
r
ocesses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff King
t35
0
3: test
cherry picking and reverting
r
o
ot commits
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
reve
r
t: allow
r
e
verting a
r
o
o
t commit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
cherry
-
pick:
handle root
comm
i
ts wi
t
h
external
strategies
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-05
J
e
f
f King
sen
d
-pack: u
n
break push ov
e
r statele
s
s rpc
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merge-one-file: fi
x
br
o
ken m
e
rges
w
ith
a
lternat
e
work
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
a
d
d tests fo
r
merge-index / merge
-
one-file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-26
Jeff Kin
g
p
r
etty: quote rf
c
822
s
pecials
in
e
mail
a
ddre
s
ses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
upload-
p
ack:
s
tart pack-
o
bj
e
c
t
s before
a
sync rev
-
list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Je
f
f
King
stash
:
drop
dirty worktree check on apply
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash
:
fi
x
acciden
t
al
ap
p
ly of non-ex
i
stent stashes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-03
Je
f
f
K
ing
pu
l
l: do
n
ot clobber untr
a
ck
e
d files
on initi
a
l pul
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-01
Jeff King
docs: fix
f
ilter-branch
s
ubdir
example for e
x
o
tic rep
o
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
remote: depreca
t
e --mirror
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
remote
:
sep
a
rate the concept of push
and
f
e
t
ch mirrors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff Kin
g
remo
t
e: disal
l
ow some nonsensical opt
i
on
c
o
mbinatio
n
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
tes
t
s:
kill
b
ackgr
o
unde
d
process
e
s
m
ore robust
l
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
pull: d
o
not clobber
untra
c
ked files on initial pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff
K
i
n
g
merge:
m
erge
unborn ind
e
x before setti
n
g ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
t
7607: clean u
p
stray un
t
racked file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
t7607: mark known breakage
i
n
t
est 11 as fixed
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-21
Jeff Kin
g
bisect
:
visualize with gi
t
-
log i
f
gitk is
u
navailable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
ch
e
ckout
:
twe
a
k detac
h
ed-orph
a
n warni
n
g format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jef
f
King
checkout: cle
a
r commit marks
a
f
t
er detached-orphan
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff
K
i
ng
c
heckout
:
add basic tes
t
s for
d
etached-orp
h
a
n
warn
i
ng
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-13
Jeff
King
d
o
c
s: point
git
.
txt author
c
redits to g
i
t-scm
.
c
o
m
commit
|
commitdiff
|
tree
2011-03-11
Jeff Kin
g
doc: a
d
d missing gi
t
footers
commit
|
commitdiff
|
tree
2011-03-11
Jef
f
King
d
o
c
:
d
rop aut
h
or/document
a
tion sections from m
o
st pa
g
es
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace
:
give repo_
s
etup t
r
a
c
e
its own k
e
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff
K
in
g
add packet tracing debug cod
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff
K
ing
t
race:
add trace_str
b
u
f
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
J
e
ff K
i
ng
t
r
a
c
e: fa
c
tor out "do
w
e want to tr
a
ce" logic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace:
r
efactor t
o
support multiple env variab
l
es
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
J
ef
f
King
t
rac
e
:
add
t
r
ace_v
p
rint
f
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff King
str
b
uf: add s
t
rb
u
f_vaddf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff
King
compat: prov
i
de a fallb
a
c
k va_copy definition
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-24
Jeff K
i
n
g
f
orma
t
-
p
atc
h
: rfc20
4
7-encode new
l
ines in headers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff King
fo
r
mat-patch: wrap l
o
ng
h
eader line
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff K
i
ng
st
r
buf: add fixed-length version of add
_
wrappe
d
_text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Je
f
f K
i
ng
diff:
don'
t
ret
r
ie
v
e binary blobs for diffstat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff King
diff: handle diffstat of rewri
t
ten binary files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
pull: prop
a
gate --progress to merge
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff
King
merge: en
a
ble prog
r
ess reporting fo
r
rename dete
c
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jef
f
K
i
ng
add inexact re
n
ame
d
e
t
ection
p
r
o
g
r
e
s
s
infr
a
structure
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff Ki
n
g
commit: stop s
e
tting rename l
i
mit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
J
e
ff King
bum
p
rename limit
defaul
t
s (ag
a
in)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
merge:
i
mprov
e
inexact
r
e
name limit warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-18
Je
f
f King
c
lone:
d
ie when
t
r
ying to cl
o
ne missing loc
a
l path
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-14
Je
f
f Kin
g
string_list_appe
n
d:
a
lways s
e
t util
pointer to NU
L
L
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
t
ests:
sanit
i
ze more
g
i
t
environme
n
t va
r
i
ables
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff
King
re
b
a
s
e: gi
v
e
a better error
m
e
ss
a
g
e
for
b
ogus branch
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebas
e
:
us
e
ex
p
licit "--" with checkou
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-10
Jeff King
docs: explain
diff
.
*
.
bin
a
ry
o
p
t
i
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-20
Jeff
K
ing
ident: die
o
n
bogus da
t
e format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
J
e
ff K
i
ng
t2
1
07: mark
p
a
s
sing test as succes
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
Jeff
K
ing
handle a
r
bitrary in
t
s in git_config_
m
a
y
be_b
o
ol
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Jeff
K
ing
tests: fli
p
executab
l
e
bit on t9158
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Jeff King
t
e
sts: add some scr
i
pt lint checks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-10
Jeff K
i
ng
d
e
f
ault color
.
status
.
b
r
anch to "same as header"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
Jeff
K
ing
docs: defaul
t
to mo
r
e m
o
dern toolset
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
J
ef
f
King
r
e
flo
g
s: cle
a
r fl
a
gs
p
r
o
perly in
c
orner case
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
Je
f
f King
allow command-speci
f
i
c
pagers in
pager
.
<cmd>
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
J
eff Ki
n
g
l
o
g
.
decorate: accept 0/1 bool values
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-16
J
e
ff King
document sigch
a
in api
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-10
Je
f
f King
d
o
cs: give
more hints about ho
w
"add -e
"
works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-05
J
e
f
f
Ki
n
g
docs:
clarify git di
f
f m
o
des
of operat
i
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-29
Jeff
K
ing
apply: don't segfaul
t
on b
i
nary files with mis
s
ing
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff King
diff: report bogus in
p
u
t to -C/-M/-B
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Je
f
f Kin
g
config: treat non-exi
s
te
n
t
c
o
n
fig fil
e
s as empty
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff King
docs: g
i
ve more hints about how "add -e
"
wo
r
ks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jef
f
King
p
ush: pass --progre
s
s do
w
n to git-pack-objec
t
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff King
tests: test terminal o
u
tp
u
t
t
o
b
o
t
h
stdout and stderr
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff
King
tests: factor out term
i
n
al handling from t7006
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-14
Jeff
King
rev-list
:
handle %x0
0
NUL in user format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-09-27
Jeff King
prefer test -h
o
v
e
r test
-L in shell scr
i
pts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-09-24
Jeff King
diff: don't use pathna
m
e-
b
ased dif
f
d
r
iv
e
rs
for sym
l
inks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
Jef
f
K
ing
tests: m
a
k
e test_must_
f
ail
f
ail o
n
missing
c
ommands
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
Je
f
f
K
ing
t
e
sts: m
a
ke test_must_fail
more verbos
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-24
J
eff Kin
g
pa
s
s "git -c foo=bar" params throug
h
environme
n
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-22
Jeff Ki
n
g
docs: fix Makefile dependency f
o
r u
s
er manual
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-06
Jeff King
test-da
t
e: fix
s
s
can
f
typ
e
c
o
nver
s
i
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
J
eff
K
i
n
g
parse
_
dat
e
: fix signed
n
ess in
timez
o
ne c
a
l
cul
a
tion
author
Jeff King
<peff@peff.net> 1275404416 +119304128
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
J
e
f
f King
t
0006:
t
est timezone parsing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-28
Jeff King
notes: c
h
e
ck number o
f
p
a
ra
m
eters to "git n
o
tes copy"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
Jeff
K
ing
Makef
i
le: default
p
ager o
n
A
IX to "m
o
re"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
J
e
f
f King
comm
i
t: give advice on e
m
pty amend
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-10
Jeff King
Makefile: default pager on
AIX
t
o
"more"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
Jeff
K
ing
pull: do no
t
hing o
n
--dry-run
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
Jeff Kin
g
remove o
v
e
r-
e
age
r
caching in sha1_
f
ile
_
name
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next