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
Retire 'stupid' merge strategy
2008-06-30
Je
f
f King
fetch:
g
i
ve a hi
n
t
to t
h
e user when loc
a
l refs fa
i
l
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-30
Jeff King
doc/rev-par
s
e: clarif
y
r
ef
l
o
g
v
s
--until for specifyi
n
g
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-27
Jeff King
fetch:
r
ep
o
rt local stora
g
e e
r
rors in status table
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-26
Jeff
King
improv
e
for-
e
ach-ref test script
commit
|
commitdiff
|
tree
2008-06-25
Jef
f
King
c
l
one: cr
e
ate intermediat
e
dire
c
tor
i
es of dest
i
nation
.
.
.
commit
|
commitdiff
|
tree
2008-06-25
Jeff King
for-
e
ach-ref: implement
m
issing ta
g
values
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-25
Jeff King
clone: cr
e
at
e
intermed
i
ate directories of d
e
stina
t
ion
.
.
.
commit
|
commitdiff
|
tree
2008-06-18
J
eff King
cl
e
an up error conventi
o
ns
of remote
.
c:
m
a
tch_explicit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-14
Jeff King
enab
l
e whitesp
a
ce checking of
t
e
s
t
s
cripts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-14
J
eff King
avoid trail
i
ng whitespace in zero-c
h
ange dif
f
s
t
a
t lines
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-14
J
ef
f
Kin
g
avo
i
d whitespace on empty
l
i
n
e
i
n
autom
a
t
ic usage message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-14
Jeff King
mask necessary whitespa
c
e policy violat
i
o
n
s in test
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-14
Jeff King
fix whitesp
a
c
e
v
i
olat
i
ons in
test scripts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-13
Jeff
K
ing
docu
m
ent --pr
e
tty=tform
a
t: opti
o
n
commit
|
commitdiff
|
tree
2008-06-04
Jeff King
Fi
x
"g
i
t clone h
t
tp://$URL"
t
o
ch
e
ck out
t
he work
t
r
e
e
.
.
.
commit
|
commitdiff
|
tree
2008-05-28
Jeff
King
clone:
make sure we support the transport type
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-21
J
e
ff
K
ing
s
e
nd-emai
l
: r
f
c2047-quote subject line
s
with non-asci
i
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-21
Jeff King
send-
e
mail: specify co
n
tent-type of
-
-c
o
m
p
ose body
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-20
Jeff King
git-am
:
fix typo in
usage message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-20
Jeff King
doc
/
g
it-daemo
n
:
s/uploadarchive
/
u
p
loadarch/
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-14
J
eff Ki
n
g
filter-br
a
nch: fix var
i
able
e
xport logic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-14
Jeff Ki
n
g
clone: bs
d
s
h
ell
p
o
rtabilit
y
f
i
x
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-14
Jeff King
t5000
:
ta
r
p
o
rtabili
t
y fix
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-14
Jeff King
fix bs
d
s
h
e
l
l negation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-08
Jeff King
doc:
c
larify defi
n
ition of "update" f
o
r
g
i
t-add -
u
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-04
Jeff King
che
c
kout: don't
r
f
c2047-
e
ncode
o
nel
i
ne
on det
a
ch
e
d
.
.
.
commit
|
commitdiff
|
tree
2008-05-03
Jeff
K
ing
dif
f
: m
a
ke
"
to
o
many
f
i
le
s
" ren
a
m
e
warning optional
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-03
Jef
f
King
bump re
n
ame limit defaults
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-03
Jef
f
King
add merg
e
.
renameli
m
i
t config option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-30
Jeff King
Doc
u
mentation: po
i
nt git-prune us
e
rs
t
o
git-gc
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-30
Jeff King
cvsimport: always pas
s
user data
to "system" as a list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-30
Je
f
f King
fix refl
o
g approxi
d
a
t
e
par
s
ing bug
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-25
Jef
f
King
remote: cre
a
t
e fet
c
h config lines with '+'
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-25
Jeff King
push: allow unqualified dest refspecs to
DWIM
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-25
J
e
ff King
doc
/
git-gc: add a no
t
e a
b
out what
is collected
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-23
J
eff King
t
5516: remove amb
i
guity test
(
1)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-23
J
e
ff King
Don't fo
r
c
e
imap
.
h
ost to be
s
et when imap
.
t
unnel
i
s set
commit
|
commitdiff
|
tree
2008-04-10
Jeff K
i
ng
git
-
r
em
o
te: show all r
e
mote
s
with "git r
e
mote show"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-10
Jeff King
git-fetc
h
: al
w
a
y
s
sho
w
stat
u
s of
n
on-trackin
g
-ref fetches
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-10
Jeff
K
ing
git-fetch:
fix s
t
a
t
u
s output whe
n
not storing tra
c
king
r
ef
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-27
Jeff King
add--interactive: allow u
s
er to choose mode update
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-27
Jeff Kin
g
add--inter
a
ctive
:
ignore mo
d
e c
h
ange
in
'
p'atch comma
n
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-27
Je
f
f K
i
ng
Documen
t
ation: clarify use of
.
g
i
t{ignore,at
t
ribute
s
.
.
.
... but gratuitously reworded by
Jeff King
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-15
Jeff King
t
600
0
li
b
: re-fix tr
portability
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
t
7505:
use SHELL
_
P
A
TH
i
n hook
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
t9
1
12: add
m
i
s
s
i
n
g #!/bin/sh header
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff
King
filter
-
bra
n
ch: use
$
SHELL
_
P
ATH instead of 'sh'
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff
K
ing
filter-branc
h
: do
n
't use
x
args
-
0
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff
King
a
d
d
N
O_EX
T
ERNA
L
_
GREP build
o
ption
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
t
6
000lib: tr portability fix
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff K
i
ng
t4020: don't
u
se grep -a
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
J
eff King
a
dd test_cmp func
t
ion
f
o
r
t
e
st s
c
rip
t
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
r
e
move use of "tail
-n 1"
a
nd
"tail -1"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jef
f
King
grep portability fix: don't use "-e
"
or "-q"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
more
tr porta
b
ility te
s
t script fixes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff K
i
ng
t0050: per
l
portability fi
x
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
t
r
p
ortab
i
l
ity fixes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-12
Jeff
K
i
n
g
t00
2
1: tr por
t
ability fix for Sol
a
ris
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-10
J
eff King
[PATCH] gitk: make au
t
oselect opti
o
nal
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-09
Jeff King
Add a test for read-
t
ree -u -
-
rese
t
wit
h
a D/F
c
onflict
commit
|
commitdiff
|
tree
2008-03-03
Jeff Ki
n
g
revert: act
u
ally c
h
ec
k
f
or a dirty i
n
dex
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-01
J
e
ff King
allow
gi
t
-
a
m
t
o
run in a subd
i
rectory
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-01
J
eff
King
rena
m
e:
warn
user wh
e
n we ha
v
e turned
off rename dete
c
t
i
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-29
Jeff King
use build-time SHELL_PATH i
n
test scripts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-25
Jeff King
hel
p
: resp
e
ct aliases
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-25
J
eff
King
m
ake
a
lias l
o
ok
u
p a public, procedur
a
l func
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-25
Jeff King
help:
use parse
o
pt
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-25
Jef
f
Ki
n
g
send-email: test compo
s
e functionality
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-25
Jeff King
t9001
:
enhance fake sen
d
m
a
il test harness
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-22
Jeff King
hash: fix l
o
okup_ha
s
h
seman
t
ics
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-21
Jeff King
d
i
f
f
: fix j
a
va funcname
pattern for solaris
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-21
Jeff Kin
g
t3404: use configured shell instea
d
of /bin/sh
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-21
Jeff Kin
g
git_config
_
*
:
don't assume we are parsin
g
a
c
o
n
fig
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-20
Jeff King
pus
h
: do
c
ument the status output
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-20
Jeff K
i
ng
Documentation/push: clarify match
i
ng refspe
c
be
h
avior
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-20
Jeff King
push: ind
i
c
a
te
p
arti
a
lness of error m
e
s
s
a
ge
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-16
Jeff King
add
-
-
i
nter
a
ctive:
handle ini
t
ial
commit better
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-16
Jeff
K
i
ng
commit:
d
iscard i
n
dex after se
t
t
ing up partial
c
ommit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-13
Jeff K
i
n
g
status: sug
g
est "git rm --cached" to unstag
e
for initi
a
l
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-13
Jeff King
hard-code the empty tree o
b
ject
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-06
Jeff K
i
ng
fix config rea
d
ing
i
n
tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-06
Jef
f
King
allo
w
s
uppressing of global and system
c
o
nfig
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-28
J
eff King
t9001:
a
dd
m
issing &&
o
perators
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-18
Jeff King
s
e
n
d
-em
a
il: add no-valid
a
t
e
option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-18
Jeff K
i
ng
send
-
e
m
a
il: val
i
date p
a
tch
e
s before sending
a
nything
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-18
Jeff
K
i
ng
se
n
d-ema
i
l: detect
invocation errors earlie
r
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-18
Jef
f
K
i
n
g
color unchanged lines a
s
"
p
lain" in "di
f
f
--col
o
r-words"
commit
|
commitdiff
|
tree
2008-01-12
Jeff
Ki
n
g
git-clean: fix off-by-on
e
memory access
when given
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-07
Jeff K
i
ng
Docu
m
ent t
h
e col
o
r
.
interact
i
v
e
s
e
mantics
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-07
Jeff
K
ing
add-
-
interactive: allow
d
iff colors
w
i
t
hout interactive
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-07
Jeff Ki
n
g
add--i
n
t
e
ractive: remove unused d
i
ff
c
olors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-05
J
e
ff King
d
i
ff
:
remov
e
lazy config loading
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-05
Jeff
K
i
ng
d
i
ff: lo
a
d funcnam
e
pattern
s
in "basic" config
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-05
J
eff King
add
a
"
ba
s
ic" di
f
f
config callback
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-02
J
eff King
git-reset: refuse
t
o do hard r
e
set in a bare
reposit
o
ry
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-02
Jeff King
config:
h
andle lack
o
f
newl
i
ne at end of file better
commit
|
commitdiff
|
tree
2007-12-24
Jeff King
c
vsimp
o
r
t
: die on cv
s
ps error
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-21
Jeff King
clea
n
up 1
.
5
.
4 release notes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-19
Je
f
f K
i
ng
te
s
t "git c
l
one -o"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-17
Jeff King
git-
s
end-
e
mail: avoid d
u
p
l
icate message-ids
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next