repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge commit 'v1.7.6' into jc/checkout-reflog-fix
2011-06-17
Jeff King
tes
t
s: li
n
k shel
l
librarie
s
into valgrind dir
e
ct
o
ry
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-06-17
Jeff King
t/Makefil
e
: pass test opts to valgrind
t
a
rget proper
l
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-31
Jeff King
diff_tree: d
i
sabl
e
Q
UICK opt
i
mizatio
n
with d
i
f
f
filter
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-30
J
ef
f
King
f
o
rmat-patch: make zero-length subject prefixes prettier
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff K
i
ng
rebase: write a reflo
g
entry when finis
h
ing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
J
e
f
f King
docs: fix
so
m
e antique ex
a
mpl
e
output
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
J
eff King
docs
:
ma
k
e
sure li
t
eral "->" isn't co
n
verted to arrow
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff Ki
n
g
docs: update status --
p
orcelain format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
J
e
ff King
d
ocs: minor
gram
m
ar fixes to git-status
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
f
o
r
mat-
p
atch: pres
e
rve sub
j
ect
n
e
w
lines
with -k
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
clean up callin
g
conv
e
ntions for pretty
.
c functions
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jef
f
King
pretty: ad
d
p
p
_
commit_easy function f
o
r simple cal
l
e
r
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff
King
m
ailinfo: always clean up rfc8
2
2 header fol
d
ing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff Ki
n
g
t
: t
e
s
t
s
u
bject handling in format-pat
c
h
/ am pipel
i
ne
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
J
eff King
r
e
a
d
_in_full
:
a
lw
a
y
s r
e
port
e
rror
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
J
e
ff King
remote
:
allow "-t" with fetch mirrors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
read_gitfile
_
ge
n
t
l
y:
u
se ssize_t
t
o hold r
e
a
d
re
s
ult
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
c
o
n
fig: always parse GIT
_
CONFIG_
P
ARAMETER
S
during g
i
t_config
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff Kin
g
git_
c
o
nfig:
don't peek at glo
b
al config_parameters
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff Ki
n
g
config: make environment parsing
ro
u
tine
s
static
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
doc: discuss textcon
v
ver
s
us external diff drivers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jeff
K
ing
receive-pack: eliminate duplicate
.
have
refs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
b
isect: refacto
r
sha1_array in
t
o a gen
e
ric sha1 list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
re
f
actor refs_f
r
om_al
t
e
r
nate_cb to allow
p
assing extra
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
Ma
k
efile: s
o
rt TEST_PROGRA
M
S list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
J
eff King
fetch: avoid repeated comm
i
ts in mark
_
complete
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-18
Jef
f
K
ing
test core
.
g
i
tprox
y
c
o
nfi
g
uration
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
send-pack: avoid
d
ead
l
o
c
k
on git:// p
u
sh
w
ith failed
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff King
connect:
let ca
l
lers know if connection is
a
socket
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
connect: treat generic proxy processes like ssh processes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
Ki
n
g
t3503:
t
est cherry picking and reverting root commits
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Je
f
f
K
ing
reve
r
t: allow reverting
a root commit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Ki
n
g
cherry-pick: handle roo
t
commit
s
with
external strategies
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-10
Jeff Ki
n
g
t7
5
01
.
8
: feed a meani
n
gful command
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-09
Jeff King
blame: add --line-porc
e
la
i
n
output for
m
at
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-09
Je
f
f Ki
n
g
blam
e
: refactor porcelain outpu
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-09
J
eff King
add tests for variou
s
blame formats
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-05
Jeff
K
i
ng
send-p
a
ck: unbr
e
ak
pu
s
h over st
a
te
l
ess rpc
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merge-one-file
:
f
i
x b
r
oken mer
g
es w
i
th alt
e
rnate work
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
J
e
ff
King
add tests for merge-index / merge-one-file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-26
Je
f
f King
prett
y
: quote
r
fc822 specials
i
n email addre
s
ses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-14
Jeff
King
format-p
a
tch:
w
r
ap email addresses after lon
g
name
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff Ki
n
g
upl
o
ad-p
a
c
k
:
s
t
a
rt pack-o
b
jects before
a
sync rev-lis
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
s
tash
:
drop dir
t
y wor
k
t
ree check on app
l
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
st
a
sh: fix acc
i
d
e
n
tal apply o
f
non-existent sta
s
hes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-03
J
eff King
pull: do not clob
b
e
r
u
n
trac
k
e
d
f
il
e
s on
initia
l
pul
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-01
Jeff King
do
c
s: fix fi
l
ter-
b
ranch subdir example for exo
t
ic r
e
po
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
J
e
ff Kin
g
r
em
o
te: dep
r
ecat
e
--mirror
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
J
ef
f
King
r
emote: se
p
a
r
ate t
h
e
concep
t
of
push and fetch mirrors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff Ki
n
g
remote: disall
o
w some
nonsen
s
ical opt
i
on combinat
i
ons
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
J
e
f
f
King
test
s
: kill ba
c
kgrounded
p
rocesses more robust
l
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff Kin
g
revision
.
c: make --no
-
no
t
es rese
t
-
-
notes list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Je
f
f Kin
g
revision
.
c: support -
-
notes command-line
o
ption
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff
King
no
t
e
s
: refact
o
r dis
p
lay n
o
tes de
f
ault
handl
i
n
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jef
f
King
no
t
es: refacto
r
disp
l
a
y notes
e
xtra refs
fiel
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
J
eff
K
i
n
g
r
ev
i
sion
.
c: re
f
actor no
t
es r
e
f expan
s
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff King
not
e
s: make expand_not
e
s_re
f
globally accessible
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
J
e
ff Ki
n
g
pull: do not clo
b
ber un
t
r
acked
f
i
les on initial pul
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
J
eff King
m
e
r
ge: merge u
n
born index bef
o
re setti
n
g ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff Kin
g
t
7
6
0
7: clean up stra
y
untrac
k
e
d fi
l
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jef
f
King
t7607
:
mark
k
nown
b
r
eakage in test 11 as f
i
xed
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-21
Jeff K
i
ng
bisect:
v
isu
a
lize with git-log if gitk
i
s unavaila
b
le
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
checkout
:
tweak detache
d
-or
p
han warning format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
checkout: clear
comm
i
t marks after
detach
e
d-orphan
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
chec
k
out: add basic
t
e
sts fo
r
detac
h
ed-orph
a
n
warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-13
J
eff K
i
ng
docs: point
g
it
.
txt
a
utho
r
credits
t
o git-
s
cm
.
com
commit
|
commitdiff
|
tree
2011-03-11
Jeff K
i
ng
doc: add missing git foot
e
r
s
commit
|
commitdiff
|
tree
2011-03-11
Jeff K
i
n
g
doc:
d
ro
p
author
/
documentation sectio
n
s
f
r
o
m
m
o
s
t pages
commit
|
commitdiff
|
tree
2011-03-08
J
eff King
trace:
g
ive repo_setup t
r
ace its o
w
n key
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Je
f
f King
add
p
acket traci
n
g
d
ebug code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace: ad
d
tr
a
ce_str
b
uf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff
King
trace: factor out
"
d
o
we
w
a
n
t
to
trace" logic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace: r
e
factor to
su
p
port multip
l
e en
v
var
i
ables
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace:
a
dd tra
c
e
_
vprintf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
J
eff
King
s
t
rbu
f
:
add strbuf_vaddf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff King
c
o
mpat: provide a fallb
a
ck va_c
o
py defini
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-24
Jeff King
f
ormat-patch
:
rfc
2
047
-
encode n
e
w
lines in headers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff King
format-patch: wrap long heade
r
lines
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jef
f
King
strbu
f
: add fixed-leng
t
h version of
a
dd_wrapped_text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff Kin
g
diff: do
n
'
t retrieve binary b
l
obs f
o
r
diff
s
ta
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff King
diff
:
handle diffs
t
at of rewr
i
tte
n
binary
f
i
les
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Je
f
f Ki
n
g
pull: p
r
opagate --pr
o
gress
t
o
m
erge
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff Kin
g
me
r
ge: e
n
able
p
rog
r
e
s
s
reporting fo
r
rename
d
ete
c
t
i
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
J
eff
King
add i
n
exact r
e
na
m
e detection progress infrastructure
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff Kin
g
commit: stop setting renam
e
l
i
mit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff
Kin
g
bump rena
m
e li
m
it
defaults (ag
a
in)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jef
f
King
mer
g
e:
improve inexact rename l
i
mi
t
w
arn
i
ng
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-18
Jeff Ki
n
g
c
lone:
d
ie when tr
y
ing
to clone missing loca
l
pa
t
h
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-14
Jeff King
st
r
i
ng_list_ap
p
end: a
l
ways se
t
util
pointer
t
o NULL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
t
e
s
t
s
:
sani
t
i
z
e more git environment var
i
abl
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
J
eff
K
ing
rebase: give a be
t
ter error message for
bogus branch
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jef
f
King
r
e
b
a
s
e:
use
explicit "--" wi
t
h che
c
kout
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-10
Jeff King
docs: explain diff
.
*
.
binary opti
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-20
Je
f
f
King
i
d
ent: di
e
on bo
g
us dat
e
forma
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
Jeff
K
ing
t
2
1
07: mark passing
t
est
a
s s
u
cc
e
s
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
Jeff
K
ing
ha
n
d
le arbitrary ints in
git_c
o
nfig_mayb
e
_bool
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
J
e
f
f
King
tests
:
f
l
ip e
x
ecut
a
ble bit
on
t
9
15
8
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Jeff K
i
ng
tests: add som
e
script lint ch
e
cks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-10
J
eff King
d
efault
color
.
status
.
branch t
o
"same as header"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
Jeff King
docs: default to
m
o
r
e modern to
o
lset
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next