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 'jk/maint-add-p-delete-fix' into maint
2009-12-08
J
e
ff Ki
n
g
add-
i
nteractive: fix deletion of non-empty fil
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-05
Jef
f
King
res
e
t: improv
e
worktree
s
afety valves
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-04
Jeff
K
i
ng
rerere: d
o
n
'
t segfault on f
a
ilur
e
t
o open r
r
-cach
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-24
Jeff Kin
g
prune-pack
e
d: only show p
r
ogress w
h
en stder
r
is a tty
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-16
Jeff King
diffcore-b
r
eak: save
c
n
t_data for
other phases
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-16
Jeff
King
diffco
r
e
-
break: free file
s
p
e
c data as we
g
o
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-09
J
e
ff King
f
o
rmat
-
pa
t
c
h: make "-p" su
p
press di
f
fsta
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
Je
f
f
King
pus
h
:
fi
x
ty
p
o in usage
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
J
e
ff King
ls-files: unbreak "
l
s-files -i"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-28
Jeff King
a
dd-in
t
eractive: handle de
l
et
i
on of em
p
ty files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-26
J
e
ff King
push: al
w
ays lo
a
d default config
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-19
Je
f
f
K
ing
cvs
i
mport: f
i
x
relative argumen
t
filenames
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-19
J
e
f
f Kin
g
do
c
ument
push's ne
w
quiet option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-12
Jeff King
ls
-
f
i
les: e
x
c
l
udes should n
o
t impact t
r
acked f
i
les
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-09
Je
f
f King
pull:
i
m
prove advice for
u
nconfigured err
o
r case
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-29
J
eff Kin
g
i
m
prove reflog date/number
h
euristic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jeff King
rebase: us
e
p
l
umbing t
o
show dirt
y
state
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jeff King
st
a
tus: make
"
ho
w
to stage" messages optional
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jef
f
King
push: make non
-
fa
s
t-forw
a
rd help message
c
on
f
i
gurabl
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff
K
ing
p
u
sh: re-fl
o
w
non-fast-forward message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Je
f
f King
p
ush: fix en
g
lish in
n
on-f
a
s
t
-forw
a
rd message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-03
J
e
ff King
pu
s
h: teach --quiet
to suppress "Everythi
n
g up-t
o
-date"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-03
Jeff
K
ing
clone: di
s
connect transport after fetching
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jeff King
fix a
p
proxidate p
a
rsing of relative months and
y
ear
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jef
f
King
tests: a
d
d date p
r
inting and parsing
t
e
sts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
J
eff King
refactor test-d
a
te interface
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-27
Jeff King
c
lone: add --bra
n
c
h
o
p
tion
to
select a differen
t
H
EAD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-25
Jeff King
checkout:
d
o not imply
"
-
f" on unborn br
a
n
c
h
es
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-18
Jeff King
tests: dis
a
ble i
n
t
e
ractive hunk se
l
ection tests if
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-17
Je
f
f Kin
g
doc
s
: descri
b
e imp
a
c
t of repa
c
k
on "clone -s"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-12
Jef
f
K
i
ng
allow pu
l
l
--rebase on branch y
e
t to
be b
o
rn
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
J
e
f
f
King
merg
e
: ind
i
c
ate remote tracking branch
e
s in merge
m
essag
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff Kin
g
merg
e
: fix incorrect merge message for a
m
biguou
s
ta
g
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
J
e
ff
King
add tests for merg
e
message
h
eadings
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
t/Makefile: include config
.
mak
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
te
s
t
s: allow user to
s
pecify
trash dir
e
ctory loca
t
i
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
tests: prov
i
de $TRA
S
H_DIRECTORY varia
b
le
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Je
f
f
K
i
n
g
te
s
ts: use "$TEST_DIRE
C
T
ORY" instead of "
.
.
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-07
Jeff King
Makefile: gi
t
-http-fetch
do
e
s n
o
t need expat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
Jeff King
transp
o
rt: d
o
n't sh
o
w push status if --quiet is giv
e
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
Jeff
King
transpo
r
t: pass "qu
i
et"
f
la
g
to p
a
ck
-
o
b
jects
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
Jeff King
pus
h
: add --quiet flag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-24
Jeff King
se
n
d-email: det
e
ct cyc
l
es in alias expansi
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-19
Jeff K
i
ng
show:
a
dd
s
pace be
t
we
e
n
mu
l
tiple
i
tems
Tagger:
Jeff King
<peff@peff.net>
Author:
Jeff King
<peff@peff.net>
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-19
Jeff King
show: suppress e
x
tra newline when s
h
owing anno
t
ated tag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-09
Jeff King
Make
f
ile: install 'git' in ex
e
cdi
r
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-01
J
e
ff King
log-tree: fix confusing c
o
mment
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-06-18
Je
f
f King
M
akefile: use compat regex on
S
olaris
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-06-18
J
eff Kin
g
Makefile:
refactor regex comp
a
t support
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-31
Jeff King
git-add
:
n
o need for -f when r
e
s
olving a conflict
i
n
.
.
.
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
fix cat-file usa
g
e me
s
sage and documentatio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
f
et
c
h: report
ref storage
D
F errors m
o
re accurate
l
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
lock_ref: inform call
e
rs o
f
una
v
ail
a
ble ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
con
v
ert bar
e
rea
d
link t
o
str
b
u
f_read
l
ink
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-20
Jeff King
for-each-ref
:
f
i
x segfault i
n
copy_e
m
ail
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
J
eff King
ad
d
: don't
c
omplain whe
n
adding
empt
y
project root
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
Jeff King
fix GIT_TRACE se
g
f
a
u
l
t with shell-quoted
a
li
a
ses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
Jeff
K
ing
parseopt: a
d
d OP
T
_NEGBIT
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-28
Jeff King
Makefi
l
e: fix NO_PERL bug
w
i
th gitweb
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-24
J
eff King
t
7
800:
r
es
p
ect
NO_PER
L
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-19
Jeff King
add-interactiv
e
: refac
t
o
r mode hunk handlin
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-18
J
eff King
doc/g
i
tatt
r
ibu
t
e
s
: clarify
l
ocat
i
on of config text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-16
Jeff
K
ing
add
-
in
t
eract
i
v
e
: refactor mo
d
e hunk
h
a
n
d
ling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff King
docs/checkout: c
l
arif
y
what "non-branch" means
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff Kin
g
doc/checkout: spli
t
chec
k
out and branch c
r
eati
o
n in
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff K
i
ng
doc/checko
u
t: refer to git
-
bra
n
ch(
1
) as appropriate
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff King
doc: refer to tr
a
cking configuration as "upstream"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jef
f
K
i
n
g
doc: clar
i
fy
--no-tr
a
ck
o
p
tion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Jeff King
add tests for remo
t
e
groups
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Jeff
K
ing
tests
:
skip perl
tests if
NO_PERL
i
s defi
n
e
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Jeff Kin
g
Mak
e
file: allo
w
b
u
ilding wi
t
hout pe
r
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
J
e
ff King
branch: show up
s
tream bra
n
ch when
d
ouble verbose
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
make get_shor
t
_ref
a
pu
b
lic fun
c
tion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff K
i
n
g
for-each
-
ref
:
add
"
upstream" format fiel
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
for-ea
c
h
-ref: refa
c
t
or re
f
name hand
l
ing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff
King
for-each-ref: refac
t
or ge
t
_
short_r
e
f functi
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-05
J
eff King
tests:
remove exit
a
fter test_done
call
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-05
J
e
ff K
i
ng
commit: abort
c
ommit if interact
i
ve add fa
i
led
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-01
Jeff
K
i
n
g
t1301:
loose
n
test for
f
orced
m
o
d
es
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-01
Jeff
King
fix portability pr
o
blem with IS_RUN_COMMAND_ERR
commit
|
commitdiff
|
tree
2009-03-23
Jeff King
t0060: fix whitespace in "w
c
-c" i
n
vo
c
ation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-23
Jeff King
Makefile:
t
u
rn o
n
U
SE_ST
_
TIME
S
P
EC
f
or FreeBS
D
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-22
Jeff
King
remote: im
p
rove sorting of "
c
onfigure for gi
t
push
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-22
J
e
ff Kin
g
ls-files:
r
e
quire worktree when --deleted is
g
ive
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-20
Jeff King
m
ake oneline r
e
fl
o
g
d
ates
more consistent with multi
l
ine
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-19
Jeff K
i
n
g
doc
:
clarify
h
ow
-
S work
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-17
Jeff Kin
g
ls-f
i
les:
r
equi
r
e wo
r
ktree when --delete
d
is
given
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-08
Jeff
K
in
g
ls-files:
f
ix broken --no-empty-d
i
rectory
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-08
Jeff King
t3000: use t
e
st_cm
p
i
n
stead of
d
iff
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff K
i
ng
document con
f
ig
-
-bool-or-int
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
J
e
ff King
config: set help text
f
o
r --
b
ool-or-int
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff King
t1300: us
e
test_must_fail as appropriate
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-05
Jeff King
i
m
prove
m
i
s
s
i
ng reposit
o
ry error mes
s
ag
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-03
Jef
f
King
clone: ru
n
post-ch
e
ckou
t
h
o
ok w
h
e
n che
c
k
i
ng out
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-27
J
e
f
f King
remot
e
: make guess
_
re
m
ote_head() use
exact HEAD lookup
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
Jef
f
King
r
e
factor find_ref_by_name() to accept const list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
J
eff K
i
n
g
add basic http
clone/fetch tes
t
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
Jeff
K
i
ng
test scripts: refacto
r
star
t
_httpd h
e
l
p
e
r
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-25
Jeff King
n
e
ver fallback relative times to absolute
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-19
Jeff
K
ing
add basic bra
n
ch
display tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next