repo.or.cz
/
git
/
mjg.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-1.6.5-reset-hard' into maint-1.6.5
2009-12-30
Jeff
K
ing
textconv: sto
p
leaking f
i
le descri
p
t
o
rs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-30
Jeff King
reset: unbreak
h
ard resets wi
t
h
GIT_WORK_TRE
E
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-16
Jeff K
i
ng
ignore unknown color
c
onfi
g
uration
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-08
J
eff
K
ing
add-inte
r
active: fix
d
eletion of non-empty files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-05
Jef
f
King
r
e
set: improv
e
w
orktree safet
y
valves
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-04
Jeff Ki
n
g
rer
e
re: don't segfault o
n
failure t
o
open rr-cache
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-24
Jeff King
prune-packed: o
n
ly show
progres
s
when st
d
err is a tty
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-16
Jeff K
i
n
g
diffcore-break:
save c
n
t_data for other phases
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-16
Jeff
K
ing
diffcore-br
e
ak: fre
e
f
ile
s
p
ec
data as w
e
go
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-09
Jeff King
f
o
rmat-patch: m
a
ke "
-
p" s
u
ppre
s
s diffstat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
Jeff King
push: fix typo in
u
s
age
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
Je
f
f
Ki
n
g
l
s
-files: un
b
reak "ls-f
i
les
-
i"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-28
Je
f
f King
ad
d
-interactive:
handle deletion of empty
f
ile
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-26
J
eff
King
p
u
sh:
always loa
d
default
c
o
nfig
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-19
Jeff King
cvsim
p
ort
:
fix rel
a
tive argume
n
t filenames
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-19
Jeff
K
ing
docume
n
t push's new quie
t
o
p
tion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-12
Jeff
K
ing
ls
-
files: ex
c
ludes should n
o
t
impact trac
k
e
d files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-09
Je
f
f King
pull: improve advice
fo
r
u
ncon
f
igured erro
r
case
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-29
J
e
f
f Kin
g
impr
o
ve re
f
l
o
g
d
ate/nu
m
be
r
heuri
s
tic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jeff K
i
ng
re
b
ase: use plumbing to show dir
t
y state
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jeff King
status: make "how to stage
"
m
essag
e
s
opt
i
o
n
a
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jeff K
i
ng
push:
ma
k
e n
o
n
-
f
ast-forward h
e
lp message co
n
figurable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff
K
i
ng
p
ush
:
re-flow non-f
a
st-forward mes
s
age
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
J
eff King
push: fix e
n
glish in no
n
-f
a
s
t
-forward m
e
ssage
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-03
Jeff
K
ing
push: teach -
-
quiet to suppress "Everyt
h
in
g
up-to-date"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-03
Jeff K
i
ng
c
lone: disconnect t
r
ansport after fetching
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jeff Kin
g
fix appro
x
idate
parsing of relative months and years
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
J
eff King
test
s
: add date
printing and parsin
g
tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jeff King
refactor test-date in
t
erface
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-27
Jeff King
clone: add --branch option to select a different
H
EAD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-25
Jef
f
King
checkout: do not imply "
-
f"
o
n un
b
orn branch
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-18
Jeff King
t
e
s
t
s: disable interact
i
ve
hunk
s
e
lectio
n
t
e
sts if
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-17
Jef
f
King
docs
:
describ
e
i
m
pact of rep
a
ck on
"
clone -s"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-12
Jeff King
a
llow pull --
r
ebase on branch yet
t
o be
b
orn
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
merge: indicate re
m
ote tracking
b
ra
n
ches in merg
e
messa
g
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff Ki
n
g
merge: f
i
x incorr
e
c
t
merg
e
mes
s
age for ambiguous tag
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
add t
e
sts for merg
e
m
e
ssage he
a
dings
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
t/Makef
i
le: include
c
o
nfig
.
mak
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff
K
i
ng
t
ests: allow u
s
er to specify trash dir
e
ctory loca
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff
K
ing
tests: provide $
T
RASH_DIRECTORY variable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
tests:
u
se "$
T
EST
_
DIRECTORY" ins
t
ead
of "
.
.
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-07
Jeff King
Makefile:
gi
t
-http-fetch does not need expat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
Jeff King
transport: don't
s
how pus
h
s
t
atus
if -
-
quiet is
g
iven
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
Jeff Ki
n
g
transport: pass "quiet" flag to pack
-
objects
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
Jef
f
King
pu
s
h:
a
dd --quiet flag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-24
Jeff King
s
e
nd-email:
d
e
t
ect cycles
i
n
alias e
x
pan
s
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-19
Jeff King
show: a
d
d sp
a
ce between m
u
ltiple
items
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
sho
w
:
suppress extra
newli
n
e when sh
o
win
g
annotat
e
d
tag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-09
Jeff King
Makefile: in
s
tal
l
'
gi
t
' in
execdir
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-01
J
e
ff Kin
g
log-tree: fix confusing c
o
mment
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-06-18
Jeff King
Mak
e
file
:
use com
p
a
t
regex on Sol
a
r
i
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-06-18
Jeff King
Mak
e
f
i
l
e
: refactor reg
e
x comp
a
t
s
upport
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-31
Jef
f
King
git-add: no need for -f when r
e
solving a conflict i
n
.
.
.
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
fix cat-fil
e
usage
messag
e
and documentation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
fe
t
ch: repo
r
t re
f
storage DF errors more accurately
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
Jeff
K
i
n
g
lock_ref: in
f
orm
c
allers of
unavailable ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
Jeff K
i
ng
conver
t
bare readl
i
nk t
o
st
r
buf_readlink
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-20
J
e
ff King
for-each-ref
:
fix
segfault in c
o
p
y_email
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
Jeff
K
ing
add: do
n
't complain w
h
e
n adding
emp
t
y project r
o
o
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
Jeff King
f
ix GIT_TRACE
s
e
gfau
l
t with shell-quot
e
d ali
a
ses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
J
e
f
f King
parseop
t
: add
OPT_N
E
GBIT
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-28
Jef
f
K
ing
Make
f
ile
:
fix NO_PERL bug with gitweb
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-24
Jef
f
K
ing
t7800: resp
e
ct
NO_PERL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-19
J
eff King
add-int
e
r
a
ctive: re
f
act
o
r mode
hunk handling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-18
Je
f
f
King
d
oc/gita
t
tributes
:
clarify
l
oc
a
tion of config text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-16
J
eff
King
add-inte
r
act
i
ve
:
ref
a
c
t
or
mode hunk han
d
l
i
n
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff
K
ing
docs/checkout: clarify what "non-
b
ranch"
m
eans
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff Kin
g
doc/
c
heckout: spli
t
checkout and branch creat
i
o
n in
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff King
doc/ch
e
c
kou
t
: refe
r
t
o g
i
t-
b
ranch(1)
as
a
ppropria
t
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff
Ki
n
g
d
o
c: refer to tracking configur
a
tion a
s
"upst
r
eam"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff
K
ing
d
oc
:
clarif
y
--no-track option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
J
e
ff King
add tes
t
s
for remote groups
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Jef
f
King
t
e
sts: ski
p
p
erl
t
e
s
ts if
NO
_
PERL is de
f
ined
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Jeff King
Makefile: allow buil
d
i
n
g
wit
h
o
u
t
perl
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
J
eff King
branc
h
:
s
ho
w
upstream branc
h
when
double verbose
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
mak
e
get_short_ref a public
funct
i
on
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff K
i
n
g
for-each
-
ref: add
"upst
r
e
a
m" fo
r
mat field
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
J
e
f
f King
for-
e
ach-ref: refacto
r
re
f
nam
e
handli
n
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff K
i
ng
f
o
r-each-ref:
r
efactor get_short_
r
ef
function
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-05
Jef
f
King
tests:
remove exit after test_done call
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-05
Jef
f
King
commit: a
b
ort commit if
i
nteractive a
d
d failed
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-01
Je
f
f King
t1
3
01:
l
o
osen
t
est f
o
r forced mo
d
es
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-01
J
e
f
f K
i
ng
fix p
o
rt
a
bility p
r
o
b
lem with
I
S
_RUN_COMMA
N
D_ER
R
commit
|
commitdiff
|
tree
2009-03-23
Jeff King
t0060: f
i
x whitespace in "wc -c" invo
c
ation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-23
J
e
ff King
Makefile: turn on U
S
E_ST_TI
M
E
SPEC for
F
reeBSD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-22
Jeff King
remote: improve s
o
rt
i
ng of
"config
u
r
e
fo
r
git
push
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-22
Je
f
f K
i
n
g
ls-file
s
: require worktre
e
w
h
en
-
-d
e
le
t
ed is g
i
ven
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-20
Jeff King
make oneline
r
eflo
g
date
s
more consistent with multilin
e
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-19
Jeff
K
i
ng
doc: clarify how -S works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-17
Jeff King
ls-files:
r
equir
e
worktree when --deleted is gi
v
en
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-08
Jeff King
ls-fi
l
es: fi
x
bro
k
en --no
-
empty-d
i
rectory
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-08
Jef
f
Ki
n
g
t3000: use test
_
cmp instead of diff
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff
King
document config --bool-or-int
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
J
eff
K
ing
conf
i
g: set help tex
t
for -
-
bool-or-
i
n
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff King
t1300: use t
e
st_must_fail a
s
a
p
propriate
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-05
Jeff King
i
m
prove
m
issing
r
epos
i
tory error mess
a
g
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-03
Jeff King
c
l
one: run post-checkout ho
o
k when checki
n
g
o
ut
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-27
J
e
ff King
remote: make guess_remote_hea
d
() use
ex
a
ct
H
EAD loo
k
up
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
Jeff
K
ing
refacto
r
find_r
e
f_by_name
(
) to accep
t
const l
i
st
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
Jeff King
add
b
a
s
ic
http c
l
one/fe
t
c
h tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next