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 'mz/doc-rebase-abort' into maint
2011-08-16
Jeff
K
i
n
g
a
m
:
r
efr
e
sh
t
he
index at start and --resolved
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-08-01
Jeff Ki
n
g
t7400
:
fix b
o
g
u
s test fai
l
ure with
s
y
m
linked trash
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-07-06
Jeff King
docs: docu
m
ent --t
e
xtconv diff opt
i
on
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-06-17
Je
f
f
K
ing
tests: link
s
hell li
b
raries in
t
o
valgrind direct
o
ry
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-06-17
Jeff King
t/Makefil
e
: pass test
o
pts to val
g
r
i
nd target prope
r
l
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-31
Jeff King
dif
f
_tree: disable QUIC
K
optimization
w
i
th
diff
f
ilter
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-30
Jeff K
i
ng
format-patch:
m
ake
zer
o
-leng
t
h subjec
t
p
r
efix
e
s pre
t
t
ier
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff K
i
ng
r
e
ba
s
e: write a reflog entry w
h
en finishing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs:
fix some antique example
o
utput
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff Ki
n
g
docs: make
sure liter
a
l "->
"
i
s
n
'
t conve
r
ted
t
o arrow
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: update status --porcelain format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
do
c
s: minor gra
m
mar
f
ixes to git-status
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
J
e
ff King
fo
r
mat-patch: preser
v
e subject newlines
w
ith -k
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
clean u
p
calling conventions for pr
e
tty
.
c functions
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
pretty:
add pp_com
m
i
t_easy
f
unc
t
ion fo
r
simple cal
l
ers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jef
f
K
i
ng
mailin
f
o:
a
lways cl
e
an u
p
rf
c
822 header folding
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
t:
test subject handling in format-patch / am pi
p
eline
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jef
f
King
rea
d
_in_full: al
w
a
ys
rep
o
rt errors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
remote: allow "-t"
with f
e
tch mirrors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff Kin
g
read_
g
it
f
ile_
g
ently: use ssize_t
to hol
d
read result
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff
K
ing
co
n
fig: always
pars
e
GIT_CONFIG_PARAMETERS during git_config
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Je
f
f King
git_
c
onfig
:
don't peek at
gl
o
b
a
l
con
f
ig_paramet
e
rs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jef
f
King
config: make environmen
t
parsing
routin
e
s stat
i
c
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
doc: dis
c
uss textconv versus extern
a
l diff drivers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
co
m
bine-diff: re
s
pect textconv a
t
tribut
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-23
Jeff King
r
ef
a
ctor
g
et_textc
o
nv to not requ
i
re d
i
f
f_filespec
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-23
Jeff King
com
b
ine-di
f
f: handle bi
n
ar
y
files as binary
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-23
Jeff King
combine-diff: calc
u
l
ate mode
_
differs ea
r
lier
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-23
Jeff King
combine-diff: split head
e
r
pri
n
ting into it
s
own func
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
r
eceive-pack: eliminate dup
l
i
c
ate
.
have re
f
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
J
eff King
bisect
:
refactor
sha1_ar
r
a
y i
n
t
o
a generic sh
a
1
list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
refactor
r
efs_from_alternate
_
cb to all
o
w passing extra
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
Makef
i
le:
s
o
rt
T
EST_PROGRAMS list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Je
f
f
Ki
n
g
fetch:
a
void
r
ep
e
ated co
m
mits in mark_
c
omplete
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-18
Jeff King
test core
.
gitpr
o
xy
c
o
nfiguration
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jef
f
King
send-
p
ack: avoid d
e
adlo
c
k on
git:// pus
h
with failed
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
con
n
ect
:
let
callers know i
f
c
o
nn
e
ction
i
s
a
socket
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
conne
c
t: treat gene
r
ic proxy processes l
i
ke
s
sh p
r
oces
s
es
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
t3503: test
cherry pic
k
ing a
n
d reve
r
t
i
ng root commits
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Je
f
f King
revert
:
allow reverting
a root commit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
cherry-pick: handle ro
o
t commits with external strategies
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-10
Je
f
f King
t7501
.
8:
f
eed a meaningful com
m
and
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-09
Jeff King
blame
:
add --line-p
o
rcelain output format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-09
J
e
ff
K
ing
b
lame: refactor porcelain
o
utput
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-09
Jeff King
a
dd
t
e
sts for va
r
i
ous blame for
m
ats
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-05
Jeff Ki
n
g
send-pack: unbreak push over stateless rpc
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merge
-
one-file: fix
broken m
e
rges
with alternate work
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
J
e
f
f
K
ing
a
dd test
s
for m
e
rge-index / merge-one-file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-26
Jeff
K
ing
pretty: qu
o
te rfc822 specials in email
a
ddresses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-14
Jeff
K
i
n
g
f
orm
a
t
-
p
atch
:
wrap email
a
ddresse
s
af
t
e
r
lon
g
n
ames
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
J
e
ff King
upload-pac
k
: start pack-obj
e
cts
before a
s
ync rev-
l
ist
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash:
d
r
o
p
d
i
rty w
o
rktree check on a
p
ply
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
st
a
sh: fix accidental apply of non
-
existent stashes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-03
Jef
f
K
ing
pull: do not clob
b
er untracked files on i
n
i
tial pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-01
Jeff King
docs: fix filter-branch subdir example f
o
r exoti
c
repo
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Je
f
f King
r
e
mote:
d
e
p
recate --mirror
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
r
e
mote: sepa
r
a
te the
concept
of push and fetch
mirrors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
remo
t
e: disallo
w
s
ome no
n
sensical option com
b
inations
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff
K
i
ng
tests: k
i
l
l backgr
o
u
n
ded
p
roc
e
sses
more
robustly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff King
revision
.
c:
m
ake
-
-no-note
s
res
e
t --notes list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff King
revision
.
c: suppo
r
t --notes command-lin
e
o
p
tion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff
K
i
n
g
note
s
:
r
efactor display
notes def
a
ult ha
n
dlin
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff K
i
ng
notes: ref
a
cto
r
display notes extra ref
s
field
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff King
re
v
isio
n
.
c: refactor notes
r
e
f expansion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff Kin
g
notes: mak
e
e
xpan
d
_not
e
s_ref
g
loball
y
a
ccessib
l
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
pull: do n
o
t clobber u
n
track
e
d files on initial pul
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
merge: merg
e
unborn index before setting ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
J
e
ff King
t7607: clean u
p
stray u
n
tracke
d
file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
t7607: ma
r
k
k
n
o
w
n
breakage in test 1
1
as fixed
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-21
Jeff
K
in
g
bisect: visualize w
i
th gi
t
-
l
og if gitk
i
s
u
navailable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff
King
ch
e
ckou
t
: tweak detached-orphan
warning for
m
at
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff
K
ing
ch
e
c
kout:
c
l
e
a
r commit
marks after d
e
t
a
ch
e
d-orphan
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff
King
ch
e
ckout: add basic
te
s
t
s
for detached-orphan w
a
rning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-13
Jeff
K
i
ng
docs: point
g
it
.
txt
a
u
t
hor credits
t
o
gi
t
-scm
.
com
commit
|
commitdiff
|
tree
2011-03-11
Jeff
K
ing
doc: add missing
git footers
commit
|
commitdiff
|
tree
2011-03-11
Jeff K
i
ng
do
c
: drop
autho
r
/docume
n
tation sect
i
o
ns fr
o
m most pa
g
es
commit
|
commitdiff
|
tree
2011-03-08
Jeff K
i
ng
trace
:
give repo_setup trace its own key
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jef
f
Ki
n
g
add pack
e
t tr
a
cin
g
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 King
trace
:
f
a
ctor ou
t
"do we want to tr
a
ce" logic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff Kin
g
tra
c
e: refac
t
or to support m
u
l
t
ipl
e
env vari
a
bles
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff Ki
n
g
tr
a
ce: add trace_vprintf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff King
strbuf: add
strbuf_vaddf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jef
f
King
compat
:
provi
d
e a fallback
va_copy defi
n
ition
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-24
J
eff King
for
m
at-pa
t
ch: rfc2
0
47-
e
ncode newli
n
e
s
i
n heade
r
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff King
form
a
t-patch
:
wrap long header l
i
nes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff
Kin
g
str
b
u
f: add fixed-length
versi
o
n of ad
d
_wr
a
p
p
ed_tex
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff King
diff:
d
on't retrieve bi
n
ar
y
blobs
f
or diffstat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff King
diff: handle dif
f
sta
t
of rewritten
b
inary files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
pull: propagate --progr
e
s
s
to mer
g
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
J
eff King
m
e
rge: enable prog
r
ess
reportin
g
for
ren
a
me detec
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff
K
in
g
add ine
x
act rename detection progress
i
nfras
t
ructure
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff K
i
ng
commit:
s
top
s
e
tti
n
g rena
m
e
limit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
bump
r
enam
e
limit defaults (again)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff Ki
n
g
merge: i
m
p
rove inexact rename limit
warn
i
n
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-18
Jeff Ki
n
g
clone:
d
i
e when t
r
ying
t
o clone
m
i
s
s
i
n
g local pa
t
h
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-14
Je
f
f Kin
g
string_
l
ist_ap
p
end: always set util
poin
t
er to NULL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
t
e
st
s
:
s
aniti
z
e more git
e
n
v
iro
n
me
n
t
variable
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
J
e
ff Kin
g
r
ebase:
g
ive a
better error mes
s
age
for bogus branch
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebas
e
:
use
e
x
plicit "--" with
che
c
kout
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next