repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Make branch merging aware of underlying case-insensitive filsystems
2008-03-27
Jeff Kin
g
add--interacti
v
e: allow use
r
to choose mo
d
e
upd
a
te
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-27
Jeff King
add--interactive: ignore mode change in 'p'atch command
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-27
Je
f
f King
Document
a
tion: clarify use of
.
git{ignor
e
,attributes
.
.
.
... but gratuitously reworded by
Jeff King
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-15
Jeff King
t6000l
i
b: re-fix
tr por
t
abilit
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
t7505:
u
se SHELL_P
A
T
H
in
h
o
ok
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
t9112: a
d
d mis
s
ing #!/bin/sh header
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
f
i
lter-branch: use
$SH
E
LL_PATH instead of 'sh
'
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
filt
e
r-b
r
anch: don't use xargs -0
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff
Kin
g
add NO_EXTERNAL_GREP
b
uil
d
option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
t6000lib
:
tr
porta
b
ilit
y
fi
x
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Je
f
f King
t40
2
0: don't use grep -a
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
J
eff King
ad
d
test_cmp function for t
e
st s
c
ripts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
remove
us
e
of "ta
i
l -n
1" and "tail -1"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff
K
ing
grep por
t
ability fix:
don't use "-e" or "-q"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
J
e
f
f King
more tr portability test sc
r
ipt fixes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff K
i
ng
t
0050: perl portability
fix
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff Ki
n
g
tr po
r
tabi
l
i
t
y fixes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-12
Jef
f
Kin
g
t0021: tr portability
f
ix fo
r
Solaris
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-10
J
e
ff
K
ing
[PAT
C
H] gitk
:
m
a
k
e
autoselect optional
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-09
J
e
ff King
Ad
d
a
test for read-tr
e
e -u --reset wi
t
h
a
D
/
F
conflict
commit
|
commitdiff
|
tree
2008-03-03
Jeff Ki
n
g
r
ever
t
: actually ch
e
ck
f
or a dirty
index
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-01
Jeff Ki
n
g
allow
git-am
to run in
a
su
b
dire
c
tory
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-01
Je
f
f
King
re
n
ame: warn user when we have turned off renam
e
d
etection
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-29
Jeff Ki
n
g
use b
u
ild-time SHELL_PATH in
test
s
c
ripts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-25
Jeff Ki
n
g
help:
r
esp
e
ct alia
s
es
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-25
Jeff King
make
a
lias look
u
p a pub
l
i
c
, procedural f
u
n
c
tion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-25
Jeff Kin
g
help: use par
s
eopt
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-25
Jef
f
King
send-emai
l
: tes
t
compose
f
unctional
i
t
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-25
Jeff King
t9001: enhance
fake sendma
i
l test harness
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-22
Jeff Ki
n
g
hash: fix lookup_hash
sema
n
t
i
cs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-21
Jeff
King
diff: fix java f
u
n
cname patt
e
rn for solaris
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-21
J
e
ff King
t3404
:
use
c
o
n
figured shell instead of
/
b
in/sh
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-21
Jeff King
git_config_*: don't assume we are p
a
r
s
ing a config
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-20
Jeff
King
push:
document the
stat
u
s outp
u
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-20
Jeff King
Doc
u
men
t
ation
/
p
ush: c
l
a
rif
y
m
atchin
g
refspec behavior
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-20
Jeff
King
pu
s
h
:
ind
i
cate partialn
e
ss of error message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-16
Jeff K
i
ng
add--interactive: handle initial co
m
mit better
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-16
Jeff Ki
n
g
commit:
discard index afte
r
setti
n
g up partial co
m
mit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-13
Jeff Ki
n
g
status: suggest "git rm --
c
ached
"
to unstage
for initia
l
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-13
Jef
f
K
ing
hard-code the empty tree object
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-06
Je
f
f King
fix con
f
ig
readi
n
g in tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-06
J
eff King
a
llow sup
p
r
e
ssing of
g
lobal and system config
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-28
Jeff King
t9001
:
add missin
g
&&
operators
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-18
Jeff King
send-email
:
add no-
v
alidate optio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-18
Jeff
K
i
n
g
send-emai
l
: validate patches before
s
ending anything
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-18
Jeff
King
send-
e
mail: detect invocation
e
r
r
ors
e
ar
l
ier
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-18
J
e
ff King
color unchanged lines
as "plain" in
"diff --color-words"
commit
|
commitdiff
|
tree
2008-01-12
Je
f
f King
git-clean: fix off-by-one
m
emory
ac
c
ess
when
g
iven
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-07
J
e
f
f King
Docum
e
nt t
h
e
color
.
interactive semantics
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-07
Jeff Ki
n
g
a
d
d--
i
n
t
eractive
:
a
l
low diff colors without
interactive
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-07
Jeff King
add--i
n
teractive: remove unu
s
ed
d
iff c
o
lors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-05
Jeff King
d
i
f
f:
remove la
z
y co
n
fig lo
a
ding
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-05
Jeff King
d
i
ff: load f
u
ncname patterns i
n
"basic" conf
i
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-05
Je
f
f King
add a "bas
i
c" diff config callback
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-02
Jeff
K
ing
g
i
t-rese
t
: ref
u
se to
d
o
ha
r
d
r
eset in a
ba
r
e
repository
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-02
J
e
ff K
i
ng
c
on
f
ig:
handle lack of new
l
ine at
end o
f
fi
l
e better
commit
|
commitdiff
|
tree
2007-12-24
Jeff King
cvsimport: die on
cvsps errors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-21
Jeff Ki
n
g
clean up 1
.
5
.
4
release n
o
tes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-19
Jeff K
i
ng
test "git clone -o"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-17
Jeff
King
g
i
t
-
send-email:
avoid duplica
t
e messag
e
-
ids
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-17
Jeff Ki
n
g
clone: correctly report http_fet
c
h error
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-16
J
eff King
rena
m
e git-browse--help
t
o git-help--browse
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-16
Jeff Ki
n
g
t
e
a
ch bas
h
co
m
pletion t
o
tr
e
at
c
o
m
ma
n
ds with
"
--" as
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-16
J
e
ff
K
ing
t
r
im_common_
t
ail: brown paper bag fix
.
commit
|
commitdiff
|
tree
2007-12-14
J
e
ff King
cv
s
exportcommit: fix massive comm
i
t
s
commit
|
commitdiff
|
tree
2007-12-11
Jeff King
git-c
l
o
n
e: print an error mess
a
ge when trying to clone
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-11
Je
f
f King
shortlo
g
:
document -e option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-11
Jeff King
g
i
t-
s
vn
:
get color config from --g
e
t-colorboo
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-11
Jeff King
Su
p
por
t
GIT_P
A
GER_I
N
_USE envi
r
onment v
a
riable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-10
Jeff King
Add git-
b
rowse-help to
.
giti
g
nore
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-09
J
e
ff K
i
ng
don'
t
m
entio
n
index re
f
r
eshing sid
e
effect in git-status
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-08
Jeff King
git-statu
s
:
do
c
u
m
entat
i
on improvements
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-08
Jeff King
add
statu
s
.
relativePaths confi
g
vari
a
ble
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-08
Jef
f
Kin
g
w
t-s
t
atus
.
c:quote_p
a
th
(
)
:
conv
e
rt empty p
a
th to "
.
/
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-06
Jeff Ki
n
g
t7300: add te
s
t
f
o
r
clean with wildcard
p
athspec
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-04
Jeff King
t9600: require
c
v
sps 2
.
1 to perfor
m
tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-03
Jeff K
i
ng
qu
o
t
e
_
p
ath: fix c
o
llapsing of relativ
e
paths
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-03
Jeff King
Enab
l
e
rewrite as well as rename detection in git-status
commit
|
commitdiff
|
tree
2007-12-02
Jeff Kin
g
t9600: test cvsimport from CVS w
o
r
king t
r
e
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-02
Jeff King
gi
t
-commit: clean
up die messag
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-30
Jeff King
cvsimport:
f
ix usage of cvsimport
.
module
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-28
J
eff Kin
g
Revert "
t
5
5
16: test update of local ref
s
on
p
ush"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-28
Jeff King
cvsimpor
t
: miscellaneous pa
c
ked-ref fix
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-28
Jeff King
cvs
i
mport: use
r
ev-par
s
e to
s
upport packed re
f
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-28
Je
f
f King
Add
basic cvsimport tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-26
Jeff K
i
ng
git-tag: test
t
hat -s implie
s
an annotated t
a
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-21
Jeff King
send-pack: cluster ref status reporting
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-21
Jef
f
King
a
void
"defi
n
ed but not used"
w
arn
i
ng for fetch_objs_via
_
wa
l
ker
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-21
Jeff King
send-email: add transfer encodi
n
g header wi
t
h content
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-18
Jeff King
send-pac
k
: fi
x
"
everything up-to-d
a
t
e
" mess
a
ge
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-18
Jeff
K
ing
send-pack: tight
e
n remote
e
rror reporting
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-18
Jeff K
i
ng
m
ake "
f
i
n
d_ref_by_name"
a pu
b
lic function
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-17
Je
f
f King
se
n
d-pack:
assign remote erro
r
s to each ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-17
Jeff King
send-pa
c
k: che
c
k ref->status before updatin
g
trac
k
in
g
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-17
J
e
ff Kin
g
send-pack: track erro
r
s for each
ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-17
Jeff
K
i
n
g
git-send
-
emai
l
: add
c
h
ar
s
et head
e
r if we
a
dd
encoded
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-16
Jeff Kin
g
git-ls-files: add --exclude-standard
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-12
Je
f
f Kin
g
git-branch: remove men
t
ion
o
f
non
-
existent '-b
'
op
t
i
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-05
J
e
ff King
send-pack: req
u
ire --verbos
e
to sho
w
u
p
date
o
f
trac
k
ing
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-05
Jeff Ki
n
g
receive-pa
c
k: d
o
n
'
t mention successful
u
pdates
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next