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 'maint'
2011-06-17
Jef
f
King
te
s
ts: link she
l
l
l
i
b
raries
into valgrind
directory
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-06-17
J
e
ff
K
i
n
g
t/Makefile: pass tes
t
opts to valgri
n
d
t
a
r
g
et proper
l
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-31
Jeff King
di
f
f
_
tree:
dis
a
ble
QUIC
K
op
t
imization with dif
f
filter
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-30
Jeff King
for
m
at
-
patch:
m
a
ke
z
ero-length sub
j
ect
p
refixes prettier
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff
K
in
g
rebas
e
:
wri
t
e a reflog
e
ntry
w
hen finishing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
d
o
cs: fix s
o
m
e
a
n
tique example output
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: make sure
literal "->"
i
s
n
'
t
co
n
verted to arr
o
w
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: update
s
tatus --po
r
celai
n
for
m
at
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: m
i
nor gramm
a
r
fixes to git-status
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
J
eff King
format-patch: preserve sub
j
ec
t
n
ewlines w
i
t
h -k
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
J
e
ff Kin
g
clean u
p
calling con
v
ent
i
o
n
s f
o
r p
r
etty
.
c
f
u
n
ction
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
pre
t
ty: add pp_c
o
mmit_easy function for simple ca
l
ler
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff K
i
ng
m
ailinfo:
a
lways clean up rfc822 header fo
l
ding
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Je
f
f King
t
:
test subj
e
ct handling
in format-patch
/
am pipeline
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
read_in_full: al
w
a
y
s
r
eport er
r
ors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff K
i
ng
remo
t
e: allow "-t" with fetch mi
r
ro
r
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
read
_
gitfile
_
gent
l
y: use
s
s
i
ze_
t
to hold read
r
e
s
ult
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
c
on
f
ig: alw
a
ys par
s
e GIT_C
O
NFI
G
_P
A
RA
M
ETERS dur
i
ng git_conf
i
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
git_confi
g
:
do
n
't
p
eek
at global
c
onfig_parameters
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
config: make envir
o
nment parsing routines static
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
d
oc: discuss te
x
tconv versus external
d
iff drivers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
receive
-
pack
:
eliminat
e
duplica
t
e
.
h
a
ve refs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
bisect:
refa
c
tor sha1_array into a generic
s
h
a
1 list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
r
efact
o
r refs_from_alter
n
ate_cb to allow
pass
i
n
g extra
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
Makefile: sort TEST_PROGRAM
S
list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
fetch:
a
void repeated commits in mark_complete
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-18
Je
f
f Kin
g
tes
t
co
r
e
.
gi
t
p
roxy
con
f
iguration
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
King
s
end-
p
a
c
k
:
avoid dea
d
lock on git://
push
w
ith failed
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
conne
c
t: le
t
c
al
l
ers know if co
n
nection is a s
o
cket
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jef
f
K
i
n
g
connect: treat generic
p
roxy pro
c
esses l
i
ke
s
sh processes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
K
i
n
g
t3503:
test cherry p
i
c
king and
r
everting root commits
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
J
eff King
rev
e
r
t: allow re
v
erting a r
o
ot
com
m
it
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff K
i
ng
ch
e
rry-pick: hand
l
e r
o
o
t
c
ommits with external str
a
te
g
ies
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-10
Jef
f
Kin
g
t7501
.
8:
feed
a
mea
n
ingf
u
l co
m
mand
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-09
Jeff K
i
ng
blame: add
-
-
line
-
porcelain output f
o
rmat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-09
Jeff King
blam
e
:
refac
t
or porcelain output
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-09
Jeff King
add tests
f
or va
r
ious blame formats
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-05
Jeff
King
sen
d
-pa
c
k: unbreak pu
s
h over
s
tateless rpc
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Je
f
f King
merge-o
n
e-file: fix broken merges wi
t
h alternate work
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add tests for
m
erge-i
n
dex /
m
e
r
ge-one-f
i
le
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-26
J
e
ff King
pretty: quote rfc822 s
p
ecia
l
s in e
m
ail addresses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-14
Je
f
f Kin
g
f
o
rmat-patc
h
: wrap
e
mail
addresses
a
fter long names
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
upload-pack: start
pack-objects before async rev-lis
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash: drop dirty workt
r
e
e
check on apply
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash: fix
accid
e
ntal apply of non-existent stashes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-03
Jeff King
pu
l
l: do not clobb
e
r
untracked files on initial p
u
ll
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-01
Jeff K
i
n
g
docs: fix filter-bra
n
ch subdir
e
x
a
m
p
le for
e
xotic repo
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
J
e
ff King
remote
:
depr
e
cate --mi
r
r
o
r
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff
King
remote: se
p
ar
a
te the conc
e
p
t
of p
u
sh and fetch mirrors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
J
e
f
f King
remote: disallow some nonsensical opt
i
on combination
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
tests
:
k
i
l
l b
a
c
k
grounded pr
o
cesses m
o
r
e robustly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff King
revision
.
c: make
-
-
n
o-notes r
e
set --notes
l
ist
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Je
f
f King
revisi
o
n
.
c
: s
u
p
p
ort --notes co
m
mand-line option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Je
f
f King
n
o
t
e
s: refactor display
not
e
s default handli
n
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
J
e
f
f
King
notes: r
e
factor
d
isp
l
ay notes ext
r
a refs
field
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff King
revision
.
c: refactor notes
r
e
f
e
xpansion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Je
f
f King
notes: make e
x
pan
d
_
n
ote
s
_ref
globally accessible
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff Kin
g
pull: do not clobber untracked fi
l
es
o
n initial pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jef
f
K
in
g
merge:
m
e
r
g
e
u
n
born ind
e
x before set
t
ing ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
J
e
ff King
t7
6
07:
clea
n
up stray untrack
e
d file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jef
f
King
t7
6
07:
m
ark known br
e
akage in tes
t
11 as fixe
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-21
J
e
f
f Ki
n
g
bise
c
t:
visualiz
e
w
i
th git-l
o
g if
gitk is un
a
va
i
lab
l
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
checkout: tweak detached-o
r
p
han warning for
m
at
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff Kin
g
c
h
eckout: clear commit mark
s
a
fter det
a
c
h
ed-orphan
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
J
e
ff King
c
h
e
ckout: add basic test
s
for deta
c
h
e
d-orphan warni
n
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-13
J
e
f
f Kin
g
docs: point
git
.
txt author credits to git
-
scm
.
com
commit
|
commitdiff
|
tree
2011-03-11
Jeff King
doc: add miss
i
ng g
i
t footers
commit
|
commitdiff
|
tree
2011-03-11
Jeff
K
ing
doc: d
r
op author/documentation s
e
c
tions from
most page
s
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace: give repo_se
t
up trace it
s
ow
n
ke
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
a
d
d pack
e
t
t
racin
g
debug code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
J
eff Ki
n
g
t
race: add
trace_strbu
f
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff Ki
n
g
trace:
f
actor out "do we want
t
o trace" logi
c
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff
King
tra
c
e
:
r
efactor to support multiple
env
variables
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
J
e
ff Kin
g
t
r
ace: a
d
d trace_vprintf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff King
strbuf:
a
dd strbuf_vaddf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff King
compat: provide a fallback va_copy de
f
inition
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-24
Jeff
K
i
ng
f
o
rmat
-
patch: rfc2047-encode newlines in header
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff King
f
ormat-patch: wrap lon
g
header line
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff King
strbuf: add
fixed-lengt
h
version o
f
a
d
d_wrapp
e
d_t
e
xt
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jef
f
King
d
i
f
f
:
don't retrieve b
i
nary b
l
o
bs for diffstat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff King
diff:
ha
n
dle diffstat of rewritt
e
n b
i
nar
y
files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff K
i
ng
pull: pr
o
pagate --pr
o
gress t
o
m
e
rge
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Je
f
f King
m
e
rge: enabl
e
progress r
e
port
i
ng for rename de
t
e
ction
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
add
inexa
c
t
ren
a
me detection progres
s
infrastruc
t
ure
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
J
e
f
f
King
commit: stop setting r
e
n
ame limi
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
J
e
ff
K
ing
bum
p
renam
e
limit
de
f
a
u
lts (again)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jef
f
K
i
ng
merge: imp
r
ove ine
x
act re
n
ame
limit warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-18
Jeff K
i
ng
clone: die when t
r
ying to clone mis
s
ing local path
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-14
Jeff King
strin
g
_li
s
t_append: always
set u
t
i
l
pointer to N
U
LL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff K
i
ng
tests: sanitiz
e
more git enviro
n
ment variab
l
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebase:
give a be
t
ter error message
f
or b
o
gus branch
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff
K
ing
r
e
base
:
use expli
c
it "-
-
" with checkout
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-10
Jeff King
docs
:
explain diff
.
*
.
binary option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-20
Jef
f
King
ident:
di
e
on bogus d
a
te format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
J
e
ff Kin
g
t2
1
07: m
a
rk p
a
s
sing test
a
s suc
c
e
ss
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
Jeff Ki
n
g
handle
a
rbitrary
i
nts
in git_config_maybe_bool
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Je
f
f King
tests: fl
i
p
executable bit on
t
9158
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Jeff
King
test
s
: add some scr
i
pt
l
int che
c
k
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-10
Jeff King
defa
u
lt col
o
r
.
status
.
bra
n
ch t
o
"same
a
s header
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
Jeff King
docs: defau
l
t to more mo
d
ern toolse
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next