repo.or.cz
/
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 'jk/cherry-pick-root-with-resolve'
2011-05-20
Jeff King
M
akefile: sort TES
T
_P
R
OGRA
M
S l
i
st
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Ki
n
g
t3503
:
test cherry p
i
cking
a
nd reverting root commits
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
revert: a
l
l
o
w revert
i
ng a ro
o
t co
m
mit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
c
herry-pick: handle root commit
s
with extern
a
l strategies
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-10
Jeff K
i
ng
t7501
.
8: fe
e
d a meaningful command
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-05
Jeff King
send-pack: unbrea
k
pus
h
over stateless rpc
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merge-
o
ne
-
file: fix bro
k
e
n
m
erge
s
with alte
r
nate work
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
J
e
ff King
a
d
d tests for merg
e
-index / merge-one-
f
ile
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
pre
t
ty: quote rfc8
2
2 s
p
ecials in email addresses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-14
Jeff King
for
m
a
t-patch: wrap email addr
e
sses af
t
er l
o
ng
n
ames
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
uplo
a
d-
p
ack:
s
t
ar
t
pac
k
-objects be
f
ore a
s
ync rev-list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
J
eff King
stash:
d
r
o
p dirty worktree check on appl
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff Ki
n
g
stas
h
:
f
ix accident
a
l apply of non-
e
xistent stashes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-03
J
eff King
pull
:
do not clobber untrack
e
d files
o
n initial pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-01
Jeff
King
do
c
s: fix f
i
lte
r
-branch sub
d
ir examp
l
e fo
r
exotic re
p
o
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
J
e
ff King
r
emote: d
e
p
r
ecate --mir
r
or
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
J
e
ff King
re
m
o
t
e: separ
a
te
t
he concept of
p
ush an
d
fetch mirrors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
remote:
d
isallow some nonsensi
c
al optio
n
combina
t
i
ons
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff K
i
ng
tests: kil
l
backgrounded processes m
o
re rob
u
stly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff
K
ing
rev
i
sion
.
c:
make --no-notes
r
e
set --not
e
s list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
J
e
f
f
K
i
n
g
revision
.
c: support --notes comman
d
-l
i
ne optio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
J
e
ff King
notes: refactor
display notes d
e
fa
u
lt han
d
ling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff King
notes: refacto
r
display notes extra refs
fie
l
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff K
i
ng
revision
.
c
:
refactor notes
r
ef
e
xpansio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
J
e
ff Kin
g
notes: make expand_notes_ref glob
a
l
l
y
accessible
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
pull:
do no
t
clobber
un
t
ra
c
ked
files on i
n
i
tial pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff Ki
n
g
mer
g
e: merge
un
b
orn in
d
ex before s
e
tting ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
J
e
ff K
i
ng
t
7
607
:
clean u
p
stray untrac
k
ed file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
t7607: mark known breakage in
tes
t
11 a
s
fixed
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-21
Jeff King
bis
e
ct: visualize wit
h
git
-
log if g
i
tk i
s
un
a
vail
a
b
l
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
chec
k
out: t
w
eak detached-orphan war
n
ing
f
ormat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff K
i
ng
ch
e
ckout: cle
a
r commi
t
m
arks a
f
ter de
t
ached-orphan
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
J
e
f
f King
checkout:
a
dd ba
s
ic
t
ests for detached-orphan
warni
n
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-13
Jeff King
d
o
cs: p
o
int git
.
txt author credit
s
to git-scm
.
com
commit
|
commitdiff
|
tree
2011-03-11
Jeff
K
ing
doc:
a
dd mi
s
sing
git footer
s
commit
|
commitdiff
|
tree
2011-03-11
Jeff King
doc: drop aut
h
or/documen
t
atio
n
sections f
r
om most pages
commit
|
commitdiff
|
tree
2011-03-08
Jef
f
King
trace: g
i
ve repo_
s
et
u
p trace its own key
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff Kin
g
add packet t
r
acing debug co
d
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
J
e
ff Kin
g
t
race:
add trace_
s
trbuf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff Ki
n
g
tra
c
e: factor o
u
t
"
do we want t
o
tra
c
e
"
logic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace: refactor t
o
support mu
l
tiple env var
i
a
b
les
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Je
f
f
K
ing
t
r
ace: add trace_
v
printf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff King
strb
u
f:
a
dd
s
trbuf_vaddf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Je
f
f King
com
p
at: provide a
f
allback va_copy defi
n
ition
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-24
Jeff King
for
m
at-patch: rfc2047-encode newlines i
n
he
a
der
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff King
format-patc
h
:
wrap
l
ong
he
a
der line
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff
King
strbuf
:
add
f
ixed
-
length version
o
f add_wrapped_text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff Kin
g
diff
:
don't retrieve binar
y
b
l
obs for diff
s
tat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff Kin
g
diff: handle diffstat of rewritten binary files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
pull: propagate --progress to m
e
rge
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
merge: ena
b
le progress reporti
n
g fo
r
rename detect
i
on
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
add inexact rename d
e
t
e
ction pr
o
gr
e
ss infr
a
structure
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff
K
in
g
commit: stop
s
etting ren
a
me limi
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Je
f
f Ki
n
g
bump
r
ename
l
i
mit
d
efault
s
(again)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
J
e
f
f King
merge: i
m
p
r
o
ve inexact ren
a
me limit warn
i
ng
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-18
Jef
f
King
clone: die when t
r
yin
g
to clone missing loc
a
l p
a
th
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-14
Jeff Kin
g
str
i
n
g
_list_app
e
nd
:
al
w
ays se
t
u
t
il pointer
t
o NULL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff K
i
ng
t
e
sts: sanitize mo
r
e git enviro
n
ment
v
ariables
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff K
i
ng
r
eba
s
e
:
gi
v
e a better erro
r
message for bog
u
s branch
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
r
e
bas
e
:
u
s
e explicit "--
"
with c
h
ecko
u
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-10
Jeff King
do
c
s: explain diff
.
*
.
binary o
p
tio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-20
Jeff
K
ing
i
d
ent: die on bo
g
u
s
d
at
e
f
o
rmat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
Je
f
f King
t
2107:
mark pass
i
ng test a
s
success
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
Jeff
K
i
ng
ha
n
d
l
e arbitrary ints in
g
it_config_maybe_bool
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Jeff Kin
g
te
s
ts:
f
l
ip e
x
ecutable bit o
n
t9158
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Jeff
King
t
e
sts: add some
s
cript li
n
t checks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-10
J
e
ff King
default color
.
status
.
branch t
o
"
same as header"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
Jeff King
doc
s
: d
e
f
a
u
l
t
t
o
more m
o
de
r
n toolset
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
J
e
ff King
ref
l
o
g
s
: clear
f
lags properly in
corn
e
r case
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
Jeff King
al
l
ow comm
a
n
d-specific pagers in
pager
.
<cmd>
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
J
e
ff King
l
o
g
.
decorate: accept 0/1
b
ool valu
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-16
Jeff King
document s
i
g
c
h
ain api
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-10
Jeff King
d
ocs
:
give more hints about how "add -
e
" wo
r
ks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-05
Jeff K
i
ng
docs:
cl
a
rify git
diff modes of operation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-29
Jeff King
apply: don'
t
segfault on bina
r
y files with
mi
s
sing
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff King
d
iff: r
e
por
t
bog
u
s input t
o
-
C/-M/
-
B
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff
K
ing
config: t
r
eat non-existent co
n
fig files as empty
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff K
i
ng
docs: give mo
r
e hin
t
s about ho
w
"add -e" works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
J
ef
f
King
push: pass --progress
down to git
-
pack-objects
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff King
tests: t
e
st terminal output to both
std
o
ut and stder
r
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
J
ef
f
King
tes
t
s
: factor out termina
l
handling fr
o
m
t7006
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-14
Je
f
f
King
r
e
v-list: handle %x00 NU
L
in u
s
er
f
ormat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-09-27
Jeff King
p
r
efe
r
test -h over test -L in shell
s
cr
i
pts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-09-24
Je
f
f
King
diff: don't use pathname-base
d
di
f
f driver
s
for
s
ymlinks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
J
eff
K
ing
tests: make t
e
st_must_fa
i
l
f
ail on missing comman
d
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
J
eff King
t
e
sts: make
tes
t
_
m
u
s
t_
f
a
i
l more verb
o
s
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-24
J
e
f
f Ki
n
g
pass "git -c
f
o
o
=bar"
p
arams thr
o
ugh environment
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-22
Jeff King
d
o
cs: fix Makefi
l
e dependency for user manu
a
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-06
Jeff King
test-
d
ate: fix
ss
c
anf type
c
onversion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
Jeff K
i
ng
parse_
d
a
te: fix sig
n
e
dness in timezone calc
u
l
a
ti
o
n
author
Jeff King
<peff@peff.net> 1275404416 +119304128
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
Jeff King
t
0006: test
t
imezone
p
arsing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-28
Jeff King
notes:
c
heck number of p
a
r
ameters
t
o
"git notes
copy
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
Jeff Ki
n
g
Mak
e
file: default
p
ager on AI
X
to "m
o
re"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
J
e
ff Ki
n
g
c
o
mmit: give advice on e
m
pty ame
n
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-10
Jeff King
Makefi
l
e
: default page
r
on AIX to
"m
o
r
e
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
Jeff King
p
ull: do nothing on -
-
dry-run
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
Jeff
Kin
g
remove over-eage
r
caching in sh
a
1_file_nam
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-24
Jeff King
dec
o
de file:// and ssh://
U
R
Ls
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-24
Jeff King
make url-rela
t
ed functions reu
s
able
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-19
Jeff King
d
ocs: clarify meaning of
-M for git-log
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next