repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint-1.7.0' into maint-1.7.1
2010-07-06
Jeff Kin
g
t
est-da
t
e: fix sscanf type
conversi
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
Jeff K
i
n
g
t
0
006: test
t
i
m
e
z
o
ne parsi
n
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-28
Je
f
f Kin
g
notes: c
h
ec
k
numb
e
r of par
a
met
e
rs to "gi
t
notes copy"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
Jeff
K
i
ng
Makefile: default pager on AIX to "
m
ore"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
Jeff K
i
n
g
commit: give advice on empty amend
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
Jeff King
pull: do no
t
hing on --dry-run
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
J
e
ff King
remove over-eager cach
i
ng
i
n
s
h
a
1
_fil
e
_name
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-19
J
eff
K
in
g
do
c
s: cla
r
i
fy mea
n
ing of -M for gi
t
-
l
o
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
Jeff King
h
andle "git --b
a
re init <dir>" p
r
o
perly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-18
Jeff Kin
g
rebase-interactive:
s
ilence warni
n
g
w
h
en no commits
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-17
Jeff
King
diff:
u
se large integers for diffstat cal
c
ulations
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-08
Jeff King
d
o
cs: c
l
arify "b
r
anc
h
-l"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-07
Jeff King
fix typ
o
s and gramma
r
in 1
.
7
.
1
draft relea
s
e notes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Jeff
King
fix
t
ex
t
c
onv leak
i
n emit_rewr
i
te_diff
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
J
e
ff King
fix c
o
nst-correctness of
wri
t
e_sha1
_
file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-03-14
Jeff King
d
i
r: fix COLLECT
_
I
G
NORED on excluded
p
refixes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-03-03
J
eff King
su
b
mod
u
le summary
:
d
o not shift
a
no
n
-e
x
i
s
t
ent positi
o
n
al
.
.
.
commit
|
commitdiff
|
tree
2010-02-24
Jeff
King
p
u
s
h: fix
segf
a
ul
t
fo
r
o
dd confi
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-23
Jeff
K
ing
add-i
n
t
e
ractive: fix bogus
diff
h
eader line ordering
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-19
Jeff Kin
g
rm: fix bu
g
i
n recursive s
u
bdire
c
tory removal
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-18
Jeff
King
d
ocs: don't talk about $GIT_D
I
R
/refs/ eve
r
ywhe
r
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-16
Jeff
K
ing
dwim
_
ref
:
fix dangling
s
ymr
e
f
warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
Jeff King
cherry-pick: prettify
t
he
a
dvic
e
mes
s
age
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
Jeff K
i
ng
cherr
y
-pick: show commit
na
m
e instead of sha1
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
Jeff King
cher
r
y-pick:
f
ormat h
e
l
p message
as str
b
uf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
Jeff King
cherry-pick: refac
t
or
commit parsin
g
code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
J
eff King
che
r
ry-pick: rewrap advice message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
J
eff K
i
ng
am:
swi
t
ch --resolved
t
o -
-
c
ont
i
nu
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-07
Jeff
King
accept
"
g
i
t g
r
e
p
-
-
pa
t
tern"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-06
Jeff Ki
n
g
Fix invalid read in quote_c_style
_
count
e
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-06
Jeff King
do
c
s: fix fil
t
er-branch example
for
quoted paths
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-31
Jeff King
mentio
n
new she
l
l
executio
n
behavior in
r
elease notes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-29
Jeff Kin
g
add sheban
g
line to git-mergeto
o
l--lib
.
sh
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-29
Jef
f
King
fix off-by-one allocation error
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-29
J
eff King
fix memcpy
o
f ov
e
rla
p
ping area
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-28
Jeff King
r
e
ject @
{
-1}
n
ot at
b
eginning of object name
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-28
Jeff
K
i
ng
fix
parsing
of
@
{
-1}@{u
}
comb
i
nation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-28
Jeff King
t
e
st combina
t
i
o
ns of @
{
}
syntax
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-28
J
e
ff King
rerere: fix to
o
-short initialization
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-28
Jeff K
i
ng
t0101: use
a
bsolute da
t
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-14
Jef
f
K
i
ng
commit: allow
suppression o
f
im
p
licit iden
t
i
t
y advi
c
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-14
Jeff King
comm
i
t
:
s
how interesting iden
t
information in summary
Committer:
Jeff King
<peff@c-71-185-130-222.hsd1.va...
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-14
Jeff King
strbuf:
ad
d
strbuf_addbuf_perc
e
ntquote
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-14
J
e
ff King
strbu
f
_
e
xpand: convert "%%" to "%
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-06
Jeff
K
i
ng
diff: run e
x
ternal diff
helper with shell
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-06
Jeff King
textconv: use shell to
r
un helper
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-06
Jeff
K
i
ng
edito
r
: use run
_
command's shell feature
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-06
Jeff K
i
ng
ru
n
-
c
om
m
and: optim
i
ze out usel
e
ss sh
e
ll c
a
lls
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-06
Jef
f
King
run-command: convert simple ca
l
lsites to
u
se_shell
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-02
Je
f
f
King
run-com
m
and: add "use shell
"
opti
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-30
J
eff King
textconv: stop leak
i
ng
f
il
e
descr
i
ptor
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-30
Jeff King
r
e
set: unb
r
eak hard resets with GIT_WO
R
K_
T
REE
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-16
J
eff King
ignore u
n
k
nown col
o
r configuration
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-08
Jeff K
i
ng
add-interactive: fix deleti
o
n of non-empty files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-07
Jeff Ki
n
g
tests: hand
l
e NO
_
PYTHON
se
t
t
ing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-07
Jef
f
Ki
n
g
status: reduce duplicated s
e
tup co
d
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-07
Jeff
K
ing
status: disab
l
e c
o
lor for porcelain
format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-05
J
e
f
f King
r
e
set: improve worktree safety valves
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
rerere:
do
n
't
segfa
u
lt on
f
ailure to
open
rr-
c
ache
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-26
Jeff King
tests:
r
ename duplicat
e
t1009
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-24
Jeff King
pr
u
n
e-packed
:
only
s
how pro
g
ress when std
e
rr is a tty
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-16
Jeff
King
d
iffcore-bre
a
k:
save cnt_da
t
a
for other p
h
ases
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-16
Jeff King
diffcore-br
e
ak:
free
f
i
l
e
spec data
as we go
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-09
Jeff King
format-p
a
tch
:
make
"-p
"
supp
r
ess dif
f
stat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
Jeff Kin
g
push: fix typo
in usage
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
J
e
f
f
King
t915{0,1}: use $TES
T
_
DIRECTORY
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
Jeff Ki
n
g
ls
-
files: unbre
a
k "ls-files -i"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-28
Jef
f
King
ad
d
-in
t
e
ractive: handle
d
eletio
n
of empty files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-28
J
e
ff Ki
n
g
gi
t
i
g
n
o
re: r
o
ot mo
s
t
p
attern
s
at
the top-
l
e
v
e
l director
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-26
J
e
ff Ki
n
g
pu
s
h: alwa
y
s load de
f
ault c
o
nfig
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-20
Jeff King
imap-send
:
re
m
ove useless uid cod
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-19
Jeff King
cvsim
p
ort: fix relativ
e
argum
e
nt f
i
l
e
names
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-19
Jeff
K
ing
d
o
c
ument push
'
s new quiet op
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-12
Jeff King
ls-
f
iles: excludes
s
hould not
i
mpact tracked
f
iles
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-09
Jeff King
p
ull
:
i
m
p
rove
advice for unconf
i
gu
r
ed error case
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-29
Jeff King
improve reflog date/n
u
mber heuristic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jeff King
r
ebase:
use plumbin
g
to show dir
t
y sta
t
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jeff King
statu
s
: ma
k
e "how to stage" messages
o
ptional
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jeff King
push
:
make non-fast-forward help mess
a
g
e
con
f
igurable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
push: re-flow
non-fast-forward me
s
sa
g
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jef
f
K
ing
push: fix engli
s
h in non-fast-forward message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
docs:
note t
h
at status conf
i
guration
a
ff
e
c
t
s on
l
y
long
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
c
o
mmit: supp
o
rt alternate status formats
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jef
f
King
s
t
a
tus: ad
d
--porcelai
n
o
u
tput f
o
rmat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
status: ref
a
ctor
f
ormat
o
ption parsing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
J
eff King
statu
s
: refactor short-mode printing
t
o its
own functio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff Ki
n
g
s
t
atus
:
typo fix in usage
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-03
Je
f
f Ki
n
g
push:
t
each --
q
uiet
to s
u
ppres
s
"Everything up-to-da
t
e
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-03
Jeff King
clone: disconne
c
t
t
r
ansport aft
e
r fet
c
hing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jeff King
fix ap
p
roxi
d
ate
parsing
o
f relative months and
y
ears
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jeff King
t
ests: add date
p
r
i
nting and parsing
t
ests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jeff King
refactor test-date
interface
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-27
Jeff King
clone: add --bra
n
ch option to s
e
l
e
ct a differ
e
nt HEAD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-25
J
e
ff King
checkout
:
do n
o
t im
p
ly "-f" on unb
o
r
n bra
n
ches
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-18
Jeff
King
tests: disable
i
nteractive hunk selectio
n
test
s
if
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-17
Jeff
K
ing
docs: describe impact o
f
repack on "clone -s"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-12
J
e
ff King
allow pull --rebase on
branch y
e
t to be born
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
merge: indicate remote tracking bran
c
he
s
in
merge message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
mer
g
e: fix
i
n
corre
c
t merge message fo
r
ambiguous t
a
g
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
add tests for merge message h
e
a
d
ings
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next