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 'ph/mergetool'
2008-06-30
Jef
f
Ki
n
g
fetch:
give a
h
int to t
h
e
u
s
er when local refs fai
l
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-30
Jeff King
doc/r
e
v
-
p
ar
s
e: clarify
r
e
f
log vs --un
t
i
l
fo
r
spec
i
f
y
i
n
g
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-27
J
ef
f
King
fetch
:
report local
s
tor
a
ge
e
rror
s
in
status table
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-26
Jef
f
K
ing
i
m
prove
f
or-e
a
ch
-
r
e
f
test
s
c
r
ipt
commit
|
commitdiff
|
tree
2008-06-25
J
eff King
clon
e
:
c
reate intermediate di
r
ec
t
ories o
f
d
e
stination
.
.
.
commit
|
commitdiff
|
tree
2008-06-25
Jeff
K
ing
for-ea
c
h-re
f
: implement missing tag value
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-25
Jeff Ki
n
g
clone:
c
r
eate int
e
rme
d
iate directories of destina
t
ion
.
.
.
commit
|
commitdiff
|
tree
2008-06-18
Jeff King
clean
u
p
error convent
i
o
n
s of
r
emote
.
c:mat
c
h
_
explicit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-14
Jeff King
e
nable whit
e
space chec
k
ing of test sc
r
ipts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-14
Je
f
f K
i
n
g
avoid trai
l
ing whitespace in zero-change d
i
f
fstat lines
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-14
Jeff King
avoid whi
t
e
sp
a
c
e on empty
l
ine i
n
autom
a
tic usage message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-14
J
e
f
f
K
ing
mas
k
necessary whitespac
e
policy vio
l
ations in test
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-14
J
e
ff King
fix whitespace violat
i
ons in t
e
st script
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-13
Jeff King
document
--pretty=tform
a
t
: optio
n
commit
|
commitdiff
|
tree
2008-06-04
Jeff King
Fix "git clone http
:
//$URL" to check out th
e
wor
k
tree
.
.
.
commit
|
commitdiff
|
tree
2008-05-28
Jeff Ki
n
g
c
l
one:
m
a
k
e sure
we suppor
t
t
he tran
s
port type
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-21
Jeff King
send-email: rfc2047-q
u
ot
e
subject l
i
n
es w
i
t
h
non-
a
sci
i
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-21
Jeff King
send-email: specify content-
t
y
p
e of --compose body
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-20
Jeff King
git-am
:
fix ty
p
o in usage message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-20
Jeff King
do
c
/git-daemon: s/upl
o
adarchiv
e
/u
p
loadarch/
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-14
Jeff Ki
n
g
filt
e
r
-
bra
n
c
h
: fix v
a
riable
e
x
port logic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-14
Je
f
f King
clone: bsd shell
portabi
l
ity
fix
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-14
Je
f
f Kin
g
t5000: tar portability fix
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-14
J
e
ff King
fix bs
d
s
h
ell negation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-08
Jeff King
doc: clarify definition of "u
p
date" for
git-add -u
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-04
J
eff K
i
n
g
checkout: do
n
't rfc2
0
47-encode
o
nel
i
ne
on deta
c
hed
.
.
.
commit
|
commitdiff
|
tree
2008-05-03
Jeff King
diff: m
a
ke "t
o
o many fil
e
s" rena
m
e war
n
ing optional
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-03
Jeff
K
in
g
bump rename
limit defaults
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-03
Jeff King
add merge
.
renamel
i
mit config option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-30
Jeff
K
in
g
Documen
t
ation:
p
oint g
i
t-prun
e
users t
o
git
-
gc
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-30
Jeff
K
ing
cvsimport:
a
lways pass user data t
o
"system" as a list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-30
Jeff
K
ing
fix
r
eflog approx
i
da
t
e pa
r
sing bug
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-25
Jeff
K
ing
remote: cre
a
te
f
e
tch co
n
fig line
s
with '+'
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-25
Jeff Kin
g
pus
h
: allow
unqua
l
ified dest refs
p
ecs
t
o DWIM
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-25
Jef
f
King
doc/gi
t
-
g
c: add
a note abo
u
t wh
a
t
i
s collected
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-23
Jeff King
t5516: remove
ambiguit
y
test (1)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-23
J
e
ff King
D
o
n
'
t force imap
.
host
to
b
e set when i
m
ap
.
tunnel is set
commit
|
commitdiff
|
tree
2008-04-10
J
e
ff
K
i
ng
g
it-remote: show all remotes with "git remote sho
w
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-10
Jeff King
gi
t
-fetch: always s
h
o
w
st
a
tus of non-tracki
n
g
-
ref fet
c
hes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-10
Jeff King
git-fetch: fix
s
tatus o
u
t
put when
not storing trac
k
i
n
g ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-27
Jeff
K
in
g
add--
i
nteract
i
ve: allow
u
ser to choose mo
d
e u
p
date
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-27
Jeff King
a
dd--interactive: ignore
mode change in '
p
'
atc
h
command
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-27
Jef
f
K
i
ng
D
o
cumentation: clarify use of
.
git{ignore,
a
ttri
b
utes
.
.
.
... but gratuitously reworded by
Jeff King
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-15
Jeff K
i
ng
t
6
000lib: re-f
i
x tr portability
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
t7505: use
S
HELL_PATH
i
n
h
ook
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
t9112: add missing #!/bin/s
h
header
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
filt
e
r-branch: use $
S
HELL_PATH
instead o
f
'sh'
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff
K
i
ng
filter-branch: don't
u
s
e
xargs
-
0
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
J
ef
f
King
add NO_EXTERNAL_GREP bu
i
ld opt
i
on
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff Kin
g
t
6
0
0
0lib: t
r
portability fix
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
t40
2
0: don't use g
r
e
p
-a
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
J
e
ff
K
ing
add test_cmp function for test scripts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff Ki
n
g
r
emove use of "tail -n 1" and "tail -
1
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Je
f
f King
gre
p
portab
i
l
i
ty fix: don't
u
se "-e" or
"
-q"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff Ki
n
g
mo
r
e
tr portabil
i
t
y
te
s
t s
c
ript fixes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff Kin
g
t0050: perl p
o
rtabil
i
ty fix
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
J
e
ff Ki
n
g
tr por
t
abi
l
ity fixes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-12
Jeff King
t0021: tr portab
i
lity
f
ix for Solaris
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-10
J
e
ff King
[PATCH
]
gitk: make auto
s
elect optional
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-09
Jeff Ki
n
g
A
dd a test for read-tree -u -
-
res
e
t with a D/F conflic
t
commit
|
commitdiff
|
tree
2008-03-03
Jeff
K
ing
revert: actually check for
a dirty index
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-01
Jeff Kin
g
a
l
low
g
i
t
-
a
m
t
o run
in a su
b
d
i
rectory
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-01
Jeff King
rename: war
n
user wh
e
n we
ha
v
e t
u
rned off rename detect
i
on
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-29
Jeff King
use build
-
time S
H
ELL_
P
ATH in te
s
t scr
i
p
t
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-25
Je
f
f Kin
g
help:
r
espect aliases
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-25
Jeff
King
m
a
ke al
i
as lookup a public, procedura
l
fu
n
c
tion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-25
Jeff
King
help:
u
s
e
p
arseopt
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-25
Jef
f
Ki
n
g
send-email: tes
t
com
p
ose f
u
n
c
tion
a
lity
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-25
Jeff Kin
g
t9001:
enhan
c
e
fake sendmail t
e
st
har
n
ess
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-22
Jeff
K
i
ng
hash: fix
l
o
okup_
h
ash semantics
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-21
Jeff
King
di
f
f:
fix java funcnam
e
pattern for
s
olaris
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-21
Jeff King
t3404: use configured
s
hell in
s
tea
d
of /bin/sh
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-21
Jeff King
gi
t
_c
o
nfig_*: don't assume we ar
e
parsi
n
g a confi
g
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-20
Jeff King
push: document
th
e
statu
s
out
p
ut
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-20
J
e
ff
King
Documentation/p
u
sh: cl
a
r
i
fy matching refspec behavior
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-20
J
e
ff K
i
ng
p
u
sh
:
indicate pa
r
tialness of error message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-16
J
eff King
a
dd--interactive: handle initial co
m
m
it bette
r
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-16
Je
f
f King
commit: discard index
after s
e
tting up partial commit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-13
Jeff King
status: sugg
e
st "git rm
-
-cached"
to u
n
stage
for
i
n
itial
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-13
Jeff
K
ing
hard-code the empty tree object
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-06
Jeff King
fix config reading in tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-06
Jeff King
allow suppressing of g
l
oba
l
and
s
ystem config
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-28
Jeff
King
t9001: add mis
s
ing && opera
t
ors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-18
Jeff King
send-e
m
ail:
add
no-va
l
i
date option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-18
Jeff King
send-email: validate patches
b
e
f
o
re
s
e
n
d
ing
a
ny
t
hing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-18
J
eff King
send-em
a
i
l: detect invocation e
r
rors
ea
r
lier
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-18
Jeff King
color
u
nc
h
anged lines as "plain" in
"diff
-
-c
o
lor-wo
r
ds"
commit
|
commitdiff
|
tree
2008-01-12
Jeff
K
i
ng
g
it-
c
lean: fix off-by-one memory access when given
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-07
J
e
f
f King
D
o
cu
m
ent the color
.
interactive
s
emantics
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-07
Jeff King
add--intera
c
tive: allow diff
co
l
ors without interactive
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-07
Jeff Kin
g
a
d
d--interactiv
e
: remove un
u
sed diff colors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-05
Jeff King
dif
f
: remove laz
y
c
o
n
fi
g
loading
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-05
Jef
f
K
i
n
g
diff: loa
d
funcname pa
t
terns in "ba
s
ic" conf
i
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-05
Jeff
King
a
d
d a "basic" diff con
f
ig callback
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-02
Jeff King
git-re
s
e
t
: refuse to
d
o hard
rese
t
in a
b
a
re re
p
o
si
t
ory
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-02
Jeff
King
config: handle lack
o
f
newli
n
e at end of
f
i
le bett
e
r
commit
|
commitdiff
|
tree
2007-12-24
Jeff King
cvsimp
o
r
t
: die on cvsp
s
errors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-21
Jeff K
i
ng
cl
e
an up
1
.
5
.
4 release not
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-19
Jeff King
test "git clone
-
o"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-17
Jeff K
i
ng
git-send-
e
mail: avoid duplicate mes
s
age-ids
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next