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 'master' into next
2011-04-03
J
eff Ki
n
g
pul
l
: do no
t
clobber untr
a
cked fil
e
s on
i
n
i
tial pu
l
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-01
Jeff
Kin
g
docs: fix fil
t
er-branch s
u
bdir exampl
e
for
exoti
c
r
epo
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
remote: depre
c
a
t
e
--mir
r
o
r
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff Ki
n
g
remot
e
: sep
a
rate the
concept of push
a
nd f
e
t
c
h
m
i
rror
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
remote: dis
a
llow some nonsens
i
cal option combin
a
tions
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
test
s
:
k
ill bac
k
g
roun
d
ed processes
m
ore r
o
bustly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff
K
i
ng
pull: do not clobber
u
n
tra
c
ked files on initial
pu
l
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff
K
ing
merge: merge unborn inde
x
befor
e
setting ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
J
e
ff Kin
g
t7607
:
cle
a
n up stray untr
a
cked file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Je
f
f King
t7607: mark
k
nown
b
reak
a
ge in test 11 a
s
fixed
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Je
f
f King
merge: tur
n
on rewr
i
te d
e
tection
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
mer
g
e
: h
a
ndle renames wit
h
replacement
c
ontent
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jef
f
King
t303
0
: fix accide
n
t
al success in s
y
mlink rename
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-21
J
eff
K
in
g
bisect:
v
isualiz
e
with git-
l
og if g
i
tk is
unavailab
l
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
J
eff King
ch
e
cko
u
t
: twe
a
k detached-orphan warning form
a
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
J
eff King
check
o
ut:
c
lea
r
commit ma
r
ks after detached-orp
h
an
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
J
e
ff King
checkout: add basic tests for detached-orphan
warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-13
Jeff Ki
n
g
d
o
cs: po
i
nt
g
it
.
txt author cred
i
ts
t
o git-sc
m
.
co
m
commit
|
commitdiff
|
tree
2011-03-11
Jeff
King
d
oc: add missing
g
it f
o
oters
commit
|
commitdiff
|
tree
2011-03-11
J
e
ff King
d
oc: drop autho
r
/
d
ocum
e
n
t
ation
sections fro
m
most p
a
g
es
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace: giv
e
rep
o
_setup trac
e
i
ts own key
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
J
e
f
f
K
ing
add packet tracing deb
u
g
code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Je
f
f King
t
r
ace: add tra
c
e_strbuf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
t
r
ace
:
factor
o
ut
"do we want to tr
a
ce" logic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
J
e
ff King
trace: re
f
act
o
r
t
o s
u
pport
m
u
l
tiple env v
a
ria
b
les
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace: add
t
race_
v
p
r
int
f
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff King
strb
u
f
:
add
str
b
uf_vaddf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff Kin
g
compat:
p
rovide
a f
a
llback va_c
o
p
y definition
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-24
Jeff King
f
ormat-patch: rfc
2
047-encode newlines in hea
d
er
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
J
eff Kin
g
format
-
patch
:
wrap lon
g
header
lines
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff King
strbuf: ad
d
fixed
-
length
v
er
s
ion of ad
d
_wrap
p
ed_text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff King
diff: don't retrieve binary bl
o
bs for diffstat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
J
eff
K
i
n
g
diff: handle
diffstat of rew
r
itten
b
inary
fi
l
es
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff
K
i
ng
pu
l
l:
prop
a
g
ate --pro
g
ress to
m
erge
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff
King
m
erge: enable pr
o
g
ress reporting
for r
e
name detecti
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
add in
e
xact rena
m
e detection p
r
ogress infrastruct
u
re
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
J
eff
K
ing
comm
i
t: stop settin
g
rename
l
imi
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff
King
bump
r
e
n
ame li
m
it
d
efaults (again)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
J
eff Ki
n
g
merge:
i
mpro
v
e inexact
re
n
ame limit w
a
rn
i
ng
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-18
J
eff King
clone: die
w
hen trying to cl
o
ne missing local pat
h
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-14
Jeff King
str
i
ng_list_appe
n
d
: alw
a
ys set u
t
il p
o
inter
to NUL
L
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff Kin
g
tests: sanitize more git environment variables
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff K
i
ng
rebase
:
gi
v
e
a
better err
o
r
message fo
r
b
o
g
us branch
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff Kin
g
rebase: use expl
i
cit "-
-
" with checkout
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-10
Jeff King
do
c
s: explain diff
.
*
.
binary o
p
tion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-20
Jeff
King
ident: die on bogus date format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
Jeff King
t2107: mark pas
s
i
ng test as succ
e
ss
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
Jeff King
handle a
r
bit
r
ary ints in
g
i
t
_config_maybe_bool
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Je
f
f K
i
ng
tests: flip
e
xecutabl
e
bit on t9158
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Jeff
K
ing
tests: add some script lint checks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-10
Jeff King
d
efault
c
o
l
o
r
.
s
t
at
u
s
.
branch to "same as header"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
Jeff King
docs: default
t
o more
modern toolset
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
Jeff
K
ing
r
e
f
logs: clea
r
flags properly in corner case
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
Je
f
f King
allow comm
a
nd-specific pagers in pager
.
<cmd>
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
Jeff King
log
.
decor
a
te: acc
e
p
t
0/1 bo
o
l valu
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-16
Jef
f
King
doc
u
ment sigchain api
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-10
Je
f
f King
docs: give more hints about
how "add -e" wor
k
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-05
Je
f
f King
docs: cla
r
ify git dif
f
m
o
des of
o
p
e
ration
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-29
J
e
f
f
K
i
ng
apply: don'
t
segfa
u
lt on binary fi
l
es with m
i
ssing
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Je
f
f King
diff: report bogus inpu
t
t
o -C/-M/-B
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff
King
conf
i
g: treat non-existent config files as
empty
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff King
doc
s
: give mor
e
hint
s
about ho
w
"a
d
d -
e
"
works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff K
i
ng
push: pass --pr
o
gre
s
s down to
g
it-pack-o
b
j
e
cts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff
K
ing
tests: test te
r
minal outp
u
t t
o
both
stdou
t
and stderr
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff Kin
g
tests: f
a
c
t
or
o
ut termi
n
al han
d
l
ing from t7006
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-14
Je
f
f
King
r
ev-
l
ist
:
ha
n
dle %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 over t
e
st -L in shell scrip
t
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-09-24
J
e
ff King
diff
:
don't use path
n
a
m
e-bas
e
d
d
iff drivers for symli
n
ks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
Jeff K
i
ng
tests: make test_
m
ust_fail fail on m
i
s
s
ing commands
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
Jeff King
tes
t
s: make tes
t
_m
u
st
_
fail more verbose
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-24
Jeff King
pass "git -c foo=
b
ar" params
t
hroug
h
e
nviro
n
m
ent
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-22
Jeff King
docs: fix Mak
e
f
i
le dependency for user manual
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-06
J
eff King
test-dat
e
: fix sscanf
t
ype co
n
v
e
r
sion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
Jeff K
i
ng
pa
r
se_d
a
te: fix signedness in time
z
one
c
a
l
cu
l
a
t
ion
author
Jeff King
<peff@peff.net> 1275404416 +119304128
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
J
e
ff King
t0006: test tim
e
zone parsing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-28
Jef
f
King
notes: ch
e
c
k
numb
e
r
o
f par
a
meters to
"g
i
t n
o
tes copy"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
Jeff King
Mak
e
file:
default p
a
ger on AIX
t
o "mo
r
e"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
Jeff Ki
n
g
commit: give adv
i
ce on empty amend
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-10
J
eff King
Makefile: def
a
ult page
r
on
A
IX to
"
more"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
Jeff K
i
ng
pull: do nothing on --dry-ru
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
Jeff King
re
m
ove over-eager caching in sha1
_
fi
l
e_
n
ame
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-24
Jeff Ki
n
g
d
ecode file:// and ssh:// URLs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-24
Je
f
f Kin
g
make url-re
l
ate
d
functions
r
eusable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-19
Jeff King
docs: clari
f
y
mean
i
ng of -M for git-lo
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
J
e
f
f King
tests: chmod +x t5150
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
Jeff K
i
ng
tests: rename duplicate t4205
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
Jef
f
King
handle "g
i
t --bare
i
n
i
t <dir>" properly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-18
Jeff K
i
n
g
r
eb
a
se-int
e
ractive: silence warn
i
ng w
h
en no co
m
mits
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-17
Jeff King
diff: use
large integer
s
for diffstat calculations
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-09
Jeff King
script with rev-l
i
st instead
o
f
l
og
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-08
Je
f
f King
docs: clarif
y
"branch -l"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-07
Je
f
f Ki
n
g
f
ix typos
and
gramma
r
i
n
1
.
7
.
1 draft re
l
ease notes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Jeff King
diff: avoid useless
fil
e
sp
e
c
p
opulation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Jeff Kin
g
diff: cach
e
te
x
tconv output
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
J
eff King
textconv: refactor ca
l
ls to
r
un_
t
e
xtconv
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Jeff King
i
n
tro
d
uc
e
note
s
-cach
e
i
n
t
erf
a
ce
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
J
ef
f
King
make commit_tree a library functio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
J
eff King
fix textconv leak in emi
t
_rewrit
e
_d
i
ff
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
J
eff
King
fix const-c
o
rrectness of write_sha1_file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-03-14
J
eff
King
dir: f
i
x COLLEC
T
_IGN
O
RED o
n
exclud
e
d pre
f
ixe
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next