repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'sp/maint-push-sideband' into maint-1.6.6
2010-02-19
Jeff King
r
m: fix
bug in recursi
v
e sub
d
i
rectory
r
emoval
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-16
Jeff
King
dwim_ref: fix dangl
i
ng symref
warnin
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-29
Jeff Kin
g
fix memcpy
o
f overlapping ar
e
a
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-30
Jeff King
textco
n
v: sto
p
leak
i
n
g fi
l
e
d
escriptors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-30
Jeff King
reset: unbrea
k
hard resets wit
h
G
IT
_
WO
R
K_TREE
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-16
Jeff Ki
n
g
ignore u
n
kno
w
n color configuration
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-08
Je
f
f King
add-
i
nteract
i
v
e: fix deletion of non-empty files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-05
Jeff
King
rese
t
: i
m
p
r
ove wor
k
tr
e
e
safety valves
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
rerere
:
do
n
'
t
segfault on failure
to
open r
r
-c
a
che
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-24
Jeff King
prune-packed: only show p
r
ogr
e
s
s when s
t
derr is a tty
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-16
Jeff
K
ing
diffcore-break: sa
v
e cnt_
d
ata for other p
h
a
s
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-16
J
e
ff Ki
n
g
diffcore-break: fr
e
e
f
i
l
e
spec
da
t
a as we go
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-09
Jeff King
format-pat
c
h: make "-
p
" suppres
s
diffstat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
Je
f
f
King
push: fi
x
typo
in
u
sa
g
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
Jeff King
t915{0,1}
:
u
se
$
TEST_D
I
RECTORY
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
J
e
f
f Kin
g
ls-file
s
:
unbrea
k
"ls-files
-
i"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-28
Jeff King
add-interactiv
e
: handle del
e
tion of emp
t
y f
i
l
es
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-28
Jeff King
gitignore: root most patt
e
rns at t
h
e top-le
v
el directory
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-26
Jeff King
push:
always load defaul
t
config
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-20
Jeff King
i
map-s
e
nd
:
remove useless uid
cod
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-19
Jeff King
cvsimport: fi
x
relat
i
v
e
argument file
n
ames
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-19
J
e
ff King
docume
n
t p
u
sh's new
quiet
o
ption
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-12
Jeff King
ls-files: e
x
clude
s
should not imp
a
c
t tracked
f
i
les
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-09
Jeff
K
ing
pull: improve a
d
vice for
u
n
co
n
f
ig
u
re
d
e
r
ror
case
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-29
Jef
f
King
improve reflog date/num
b
er
heuristic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jeff Ki
n
g
rebase: use plumbing to show
d
i
rty state
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
J
e
ff K
i
ng
sta
t
us
:
make "how
to stage" m
e
ssages opt
i
onal
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jeff King
pu
s
h: ma
k
e
no
n
-fast-forw
a
rd
he
l
p
mess
a
ge configura
b
le
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Je
f
f King
pu
s
h: re-
f
low non-fast-forward message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jef
f
King
p
u
sh: fix en
g
lish in non-fast-forward m
e
ssage
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-03
Jeff King
p
us
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 King
clone:
disco
n
nect trans
p
o
rt after fetchi
n
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jeff King
f
ix approxidate parsing of r
e
la
t
iv
e
months and years
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jeff King
tests: add date print
i
ng and parsi
n
g tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jeff King
r
e
f
actor test-date interf
a
ce
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-27
Jeff King
c
l
on
e
: ad
d
--branch option to sele
c
t a different
H
EAD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-25
Jeff Kin
g
checko
u
t
: do
not
i
m
pl
y
"-f" on unborn b
r
anch
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-18
Jeff King
tests: disable interacti
v
e hunk
s
election
t
ests if
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-17
J
eff King
docs:
d
escri
b
e impact of repack on
"
clone -s"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-12
Jeff
King
allo
w
pull --rebase on branc
h
yet to be born
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
merge:
i
ndicate r
e
m
ote tracki
n
g branches in mer
g
e mes
s
age
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jef
f
Kin
g
me
r
ge:
fix incorre
c
t
m
erge message for a
m
biguous tag
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Je
f
f King
ad
d
tests for
merge
message headings
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
t/Mak
e
file: inc
l
ude co
n
fig
.
m
a
k
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
test
s
:
allow user
t
o
s
pe
c
i
f
y trash directory loc
a
tion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff
K
ing
tests:
provi
d
e $TRA
S
H_DIRE
C
TORY var
i
able
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff Ki
n
g
test
s
: use
"$TEST_DIR
E
CTORY" inst
e
ad of "
.
.
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-07
Je
f
f King
Makefile:
git-http-fetch
d
oes n
o
t need expat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
Jef
f
King
transport
:
d
o
n't show push stat
u
s if --q
u
iet is given
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
Jeff King
transpo
r
t:
p
ass "quiet" flag to
pack-o
b
jects
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
Jeff King
pus
h
: a
d
d
-
-quiet fla
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-24
Jeff King
s
en
d
-email: de
t
ect
c
ycl
e
s in alias
e
xpansi
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-19
Jeff King
show: add spac
e
between mu
l
ti
p
le
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
show: suppress extra newl
i
ne w
h
en showing ann
o
tated tag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-09
Jeff King
Makefile
:
insta
l
l '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 comment
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-06-18
Jeff King
Makefi
l
e: use comp
a
t
regex on Solaris
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-06-18
Je
f
f King
Makefile: refactor regex compat supp
o
rt
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-31
J
e
f
f
King
git-a
d
d
:
no need
f
or -f when r
e
s
olvin
g
a c
o
nfl
i
ct in
.
.
.
commit
|
commitdiff
|
tree
2009-05-25
J
e
f
f King
f
ix cat-
f
ile usag
e
message and
documentation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
fetch: report ref storage DF e
r
r
ors
m
o
r
e
acc
u
ratel
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
J
e
f
f
K
ing
loc
k
_ref: infor
m
callers of
unavailable ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
c
onvert bare readlink to strbuf_readl
i
nk
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-20
Jeff Ki
n
g
for-each-ref: fix segf
a
ult in copy_emai
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
Jeff King
add: don't
complain when
a
d
ding empty project root
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
Jeff
K
ing
fix GIT_TRACE segfault with shel
l
-
q
uoted ali
a
ses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
J
e
ff King
p
a
rseopt: ad
d
OPT_NEGB
I
T
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-28
Je
f
f King
M
a
kef
i
le:
fix NO_PERL bug w
i
th
g
itweb
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-24
Jef
f
King
t7800: res
p
e
ct N
O
_P
E
RL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-19
J
eff King
add
-
interactive: refactor mode hunk handling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-18
Jeff King
doc/gitattributes: clarify locatio
n
of
config tex
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-16
Jeff King
add
-
i
nt
e
ractive:
refactor mod
e
hunk handling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Je
f
f King
d
ocs/checkout: clari
f
y
w
hat "non
-
branch" means
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
J
e
ff
K
ing
doc/checkout: split che
c
kout and branch creation in
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff King
doc/che
c
k
o
ut: refer
t
o
git-branc
h
(1
)
a
s
appropriate
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
J
eff King
do
c
:
refer to tracking configuration as "
u
pstream"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff King
doc: clarif
y
--no-tr
a
ck
option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Jeff
Ki
n
g
add tests for r
e
m
o
t
e
groups
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Jef
f
King
tests: sk
i
p perl
t
es
t
s if NO
_
PE
R
L
is de
f
ined
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Jeff Kin
g
Makef
i
le: allow bu
i
ldi
n
g
without perl
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
branch: show upstream b
r
anch
when double
v
er
b
ose
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Je
f
f King
make get_short_ref a publi
c
func
t
i
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff Kin
g
for-each-ref: add "ups
t
ream" for
m
at fi
e
ld
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
f
or
-
e
a
ch-ref: refacto
r
refnam
e
hand
l
in
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
for-eac
h
-ref: refactor get_s
h
ort_ref function
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
tests
:
remove exit after t
e
s
t
_done
call
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-05
J
e
ff Kin
g
com
m
it: abort commit if
interactive add
f
ailed
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
t1301: loosen t
e
st
f
or forced
modes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
fix portability
p
roblem with IS_
R
UN_CO
M
M
AND_ER
R
commit
|
commitdiff
|
tree
2009-03-23
Jeff King
t
0
060:
f
ix whitespace
in
"
wc -
c
"
i
nvocation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-23
Jef
f
Kin
g
Makef
i
le: turn o
n
USE_ST_TIMES
P
EC
for FreeBSD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-22
Jeff King
r
e
mote:
imp
r
ove sorting o
f
"conf
i
gure for
git push
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-22
J
eff King
ls-files: requir
e
worktre
e
when --delet
e
d is given
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-20
Jeff King
make oneline r
e
flog dates
m
ore consist
e
nt with multi
l
in
e
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-19
J
e
ff King
d
o
c:
c
larify how -S
w
ork
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-17
Jeff Ki
n
g
ls-files: requi
r
e w
o
rktree whe
n
--
d
eleted is gi
v
en
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-08
Jeff King
ls-files: fix broken --no-empty
-
d
irectory
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-08
J
e
f
f
K
ing
t3000:
u
se test_
c
mp instead
of
d
if
f
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
J
e
ff King
d
o
cument config --bool-o
r
-int
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff
K
in
g
c
o
nfi
g
: set help text f
o
r --bool-or-int
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next