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 'jm/mergetool-submodules' into maint
2011-04-29
Jeff Kin
g
m
erge
-
one-file: fix broke
n
merges wit
h
alt
e
rnate work
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
J
eff King
add tests for m
e
r
ge-index / mer
g
e-one-file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-26
Jef
f
K
i
ng
pretty:
q
u
o
t
e rf
c
822 spe
c
ials
i
n email addresses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
J
eff King
upload-
p
ack: start pac
k
-obje
c
t
s befo
r
e
as
y
n
c
r
ev-
l
ist
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff
K
i
ng
stash
:
drop dirty worktree
c
h
eck on apply
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash: f
i
x acciden
t
al apply of non-e
x
istent st
a
shes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-03
J
eff King
pull
:
do no
t
clobber
untracked
f
iles on initial p
u
ll
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-01
Jeff King
docs: fix filter
-
b
r
anch sub
d
ir example fo
r
e
x
o
tic rep
o
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Je
f
f King
remote:
d
eprecate --mirror
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jef
f
K
i
n
g
remote: separ
a
t
e
the
concept of push and fetch mirrors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
r
emote: di
s
allow som
e
no
n
sen
s
ical option combinations
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
J
e
ff K
i
ng
tests:
k
ill
b
ackgrounded p
r
ocesses more robust
l
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
pull: do
not clobber untracke
d
files
o
n initial pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
J
eff King
me
r
ge: merge unbor
n
index before setting ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
t76
0
7:
c
lean u
p
stra
y
untracked
f
ile
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
t7607
:
mark known breakage in t
e
st 11
a
s
f
ixed
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-21
Jeff King
b
is
e
ct: visualize with git-log if
g
itk is unav
a
il
a
bl
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
checkout: tweak d
e
tached-orphan warni
n
g
for
m
at
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
checkout: clea
r
commit marks
a
fter detached-o
r
p
h
an
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
checkout: add basic
t
ests
f
o
r
detach
e
d-orphan warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-13
Jeff King
docs: poin
t
g
it
.
t
x
t
a
uth
o
r
c
redits to git-scm
.
com
commit
|
commitdiff
|
tree
2011-03-11
J
e
ff
K
i
ng
do
c
:
a
dd mis
s
ing
g
it footer
s
commit
|
commitdiff
|
tree
2011-03-11
J
e
ff
K
i
n
g
doc
:
d
r
op au
t
hor/docume
n
tati
o
n
s
ectio
n
s f
r
o
m mo
s
t pages
commit
|
commitdiff
|
tree
2011-03-08
Je
f
f Ki
n
g
trace: give r
e
p
o_setup
trace
i
ts
o
w
n key
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff
K
ing
add pa
c
ket tracing
debug code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace:
a
dd trace_strbuf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff
K
ing
tr
a
ce: fa
c
tor out
"
do we want
to
t
r
a
c
e" logic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace:
refac
t
or to
s
upport mult
i
p
l
e
env variab
l
es
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace
:
add trace_v
p
rintf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff Ki
n
g
strbuf
:
add str
b
uf_vaddf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff King
compat: provide a fallback va_copy defini
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-24
Jef
f
K
i
ng
format-patch: rfc
2
047-encode new
l
ines
in headers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jef
f
Kin
g
format
-
patch: wrap long
header line
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
J
eff K
i
ng
s
t
rbuf: add fixe
d
-length
vers
i
o
n
of add
_
wra
p
p
ed
_
text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff
K
i
n
g
diff: do
n
't retrieve b
i
nary
b
lob
s
for dif
f
stat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff King
diff: handle diffstat of rewritten bin
a
ry f
i
les
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Je
f
f King
pull: prop
a
g
ate --progress to m
e
rge
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
J
e
ff King
merge: enable pro
g
re
s
s r
e
porting
f
or rename detection
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff K
i
ng
ad
d
inexact
r
e
name detecti
o
n
progress infras
t
ructure
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
commit:
s
top setting
rena
m
e limit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
bump
rename li
m
it defaults
(
agai
n
)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
J
e
f
f Ki
n
g
m
e
rge: impr
o
ve inexact re
n
ame lim
i
t warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-18
Jeff King
c
l
one: die when
t
r
ying to clone missing
loc
a
l path
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-14
J
eff
K
ing
string_lis
t
_append
:
a
lways set util
p
o
inte
r
t
o NULL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
J
eff King
tests: sanitize more git environment
v
a
riable
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebase: g
i
v
e a better error message for bogus b
r
anc
h
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebase: use explicit "-
-
" with chec
k
o
ut
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-10
Jeff
K
ing
docs
:
explain d
i
ff
.
*
.
bina
r
y
o
ption
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-20
Jeff King
id
e
nt
:
die
o
n
bog
u
s date format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
J
eff
K
ing
t2107: mark passing test as
suc
c
es
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
Jeff King
handle arbitrary ints in git_co
n
fig_
m
aybe_b
o
ol
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Je
f
f King
tests: fl
i
p exe
c
u
table bit
on t9158
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Jeff
King
tests:
a
d
d s
o
me
script li
n
t checks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-10
Jef
f
King
d
efault
c
o
lor
.
stat
u
s
.
branch t
o
"s
a
me as
h
eader"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
J
e
ff King
doc
s
: default to more m
o
dern toolset
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
Jef
f
King
reflogs: clea
r
flags
p
roperly i
n
corner
c
a
se
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
J
eff King
a
l
low
command-specific pagers in pager
.
<cmd
>
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
Je
f
f K
i
ng
log
.
decorate: accep
t
0/1 bool v
a
lues
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-16
Jeff Ki
n
g
document sigchain api
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-10
Jeff King
docs: give more hints about how "add -e"
works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-05
Jeff King
docs: clar
i
f
y
g
it d
i
ff modes of operation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-29
Jeff King
app
l
y: don't segfault on bin
a
ry
files with missing
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff King
diff:
r
eport bogus i
n
p
ut to -C/-M/-B
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff King
c
o
nfig: treat non-existent
c
onfig f
i
les as empty
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff
King
docs: give more hints about how "add -e" wo
r
ks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff King
push:
p
ass --pr
o
gress down to git-pack-obj
e
cts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff King
tests: t
e
st terminal outpu
t
to bot
h
stdout and stderr
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff K
i
ng
tests: fa
c
tor out
te
r
mina
l
handling from t
7
006
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-14
Jeff Kin
g
rev-list: h
a
ndle %x00 NUL in
u
se
r
fo
r
mat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-09-27
J
e
ff
King
p
r
ef
e
r test -h ov
e
r tes
t
-L in s
h
ell scripts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-09-24
J
e
ff King
diff: don
'
t u
s
e
pa
t
hna
m
e-based diff drivers for sym
l
inks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
J
eff King
tests
:
m
a
k
e test_must_fail f
a
il o
n
mi
s
s
ing command
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
Jeff Ki
n
g
tests:
m
ake te
s
t_m
u
st_fail mor
e
verbos
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-24
Jeff Ki
n
g
pass
"git -c foo=bar
"
params thro
u
g
h
e
nvironmen
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-22
Je
f
f
K
in
g
docs:
f
ix M
a
kefile depende
n
cy for user
manual
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-06
Jeff King
test-date: f
i
x sscanf type c
o
nversion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
Jeff King
parse_date:
fix signed
n
ess in time
z
one calculation
author
Jeff King
<peff@peff.net> 1275404416 +119304128
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
Jeff King
t0006
:
test time
z
one parsi
n
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-28
Jef
f
King
not
e
s
:
che
c
k
number of paramet
e
rs to
"git no
t
es copy"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
Jeff
K
i
n
g
Makef
i
le: defau
l
t pa
g
er on AIX to
"
m
ore"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
Jeff King
commit
:
giv
e
ad
v
ice
on empty amend
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-10
J
eff King
Makefil
e
:
defa
u
l
t pa
g
er on AIX to
"
more"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
J
e
ff King
pul
l
:
d
o not
h
ing on --
d
ry-run
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
Je
f
f King
remove ov
e
r
-eager
cachin
g
in sh
a
1_f
i
le_name
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-24
Jeff King
de
c
o
d
e file:/
/
a
n
d
ssh://
URLs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-24
Je
f
f
K
ing
make url-related f
u
nction
s
reusable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-19
Jeff K
i
ng
d
oc
s
: cla
r
ify meaning of
-
M
for git-log
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
Jeff King
tests: chmod +x t5150
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
Jeff King
tests: re
n
ame duplicat
e
t4205
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
Jeff King
h
andle "git -
-
bare init <dir>" pr
o
perly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-18
Jef
f
K
i
ng
r
e
base-interactive: s
i
lence
w
a
r
n
ing when no c
o
mm
i
ts
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-17
J
e
ff King
diff: use la
r
ge
i
nte
g
ers f
o
r diffstat cal
c
ulations
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-09
Jeff
King
script wi
t
h
re
v
-list instead
o
f log
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-08
Jeff Kin
g
docs:
cla
r
i
f
y "branch
-
l
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-07
Jeff King
fix typos and gr
a
mmar in
1
.
7
.
1 draft r
e
lease n
o
tes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Jeff
King
d
iff
:
avoid useless
f
ilespe
c
popul
a
t
i
on
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Jeff King
diff: ca
c
h
e textconv outpu
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Jeff
K
ing
textconv: refacto
r
ca
l
ls t
o
run_textconv
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Jeff K
i
ng
introduce notes-cache interface
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Jeff King
mak
e
commit_tree a li
b
rary fu
n
ction
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next