repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
advice: Introduce error_resolve_conflict
2011-06-17
Jeff Kin
g
tests
:
link shell libra
r
ies into valgrind directory
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-06-17
J
eff King
t/Makefile:
pass test op
t
s to valgri
n
d target properly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-31
J
e
ff King
diff_tree: disable QUI
C
K
optimiza
t
ion with diff filter
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-30
J
eff K
i
ng
form
a
t-p
a
tch
:
make z
e
ro-leng
t
h subject p
r
e
fixes pre
t
t
i
e
r
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
rebase: write a reflo
g
e
n
try
wh
e
n finishi
n
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff K
i
ng
docs: fix some antiqu
e
example
output
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
d
oc
s
: make
s
u
re lite
r
al "-
>
" isn't con
v
e
rt
e
d to
a
rrow
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: updat
e
status
-
-p
o
r
celain format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: minor
g
rammar fixe
s
to
g
i
t
-
s
tatus
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
for
m
a
t
-p
a
tch: p
r
es
e
rv
e
subj
e
c
t newlines wi
t
h -k
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
clean
up calling conv
e
n
t
ions for pretty
.
c function
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff
K
ing
p
retty: add
p
p_commit_easy function for simple callers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
m
ailinfo: always clean
u
p r
f
c822 header foldi
n
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff K
i
ng
t: test subject hand
l
i
ng in f
o
rmat-pat
c
h / am pipeline
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
read
_
in_f
u
ll: al
w
ays report
e
rrors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff Ki
n
g
remot
e
:
a
llow
"
-t" with fetch mirrors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
r
ead_git
f
ile_gently:
use ssiz
e
_t to hold read r
e
sul
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
J
e
ff King
config: always pa
r
se GIT_CONFIG_
P
ARAMETERS during git_config
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff Kin
g
git_conf
i
g
:
don't
pee
k
at gl
o
b
al co
n
fig_parameters
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Je
f
f
K
i
ng
config:
m
ake environm
e
n
t
p
a
rsing rou
t
in
e
s st
a
tic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff
K
i
ng
d
o
c: discu
s
s text
c
o
nv
v
ersus externa
l
di
f
f drivers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
rece
i
v
e
-
pack:
e
liminate duplicate
.
h
ave
r
efs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
J
e
ff King
bisect:
r
efac
t
or sha1_array into a generic sha1
l
ist
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
refactor refs_from_alternate_cb to allow pas
s
ing extra
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
J
eff Ki
n
g
Makefile: sort TES
T
_
PR
O
GRAM
S
lis
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
fetch:
avoid
r
e
p
eate
d
commits
in m
a
rk_complet
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-18
Jeff King
test core
.
gitp
r
oxy configuratio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff King
send-pack
:
avoid deadlock on git://
p
ush
w
ith failed
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff King
connect: let caller
s
k
n
ow if connecti
o
n
is a socket
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
K
ing
connect: treat gen
e
r
ic proxy p
r
oc
e
sses like s
s
h processes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Kin
g
t3503: test cherry picking and reverting root c
o
mmits
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
King
rev
e
rt: allow reverting a root commit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
cherry-pi
c
k: handl
e
root
c
om
m
it
s
with external
s
tra
t
egies
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-10
J
eff K
i
ng
t7501
.
8:
f
e
ed a
m
eani
n
gf
u
l command
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-09
J
eff King
blame: add --line-p
o
rcelain output format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-09
Jeff King
blame:
r
efa
c
tor
porcelain output
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-09
J
e
ff King
add
t
e
s
t
s
f
o
r va
r
iou
s
blame formats
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-05
Jeff King
send-pack
:
unbreak pus
h
over stateless r
p
c
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Jeff Kin
g
merge-
o
ne-file: fix broken merges
wit
h
alter
n
at
e
work
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Jeff
K
ing
add te
s
ts for m
e
rge-index /
m
erge-on
e
-fil
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
p
retty: q
u
ote rfc822
s
p
ecials in email
add
r
esse
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-14
J
e
ff King
format-patch:
wrap email addresses af
t
e
r long names
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff Kin
g
upload-pa
c
k
: start pack-object
s
b
e
f
o
r
e
a
sync rev-list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash: drop
d
i
rty worktr
e
e
c
heck
on apply
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
J
e
ff King
stash:
f
ix accidental
a
p
p
ly of non-existent stashes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-03
Jeff
K
ing
p
ull: do
n
ot clobber untracked fil
e
s o
n
ini
t
ial pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-01
Jeff King
docs: fi
x
f
i
l
ter-br
a
nch subdir exam
p
le
f
or exotic repo
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jef
f
King
remot
e
: depreca
t
e --mirro
r
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
re
m
ote: sep
a
rate
the concept of push
and fetch mirro
r
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
remo
t
e: dis
a
llow some nonsensical option combinat
i
on
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff Ki
n
g
t
es
t
s: k
i
ll backgrounded processes more robustly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff K
i
ng
r
evision
.
c: make --no-notes reset --not
e
s li
s
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff King
revision
.
c: sup
p
ort --no
t
es command-line opti
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff K
i
ng
notes:
refactor display notes defaul
t
handling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff Kin
g
notes: ref
a
ctor d
i
s
p
lay notes extra
r
efs field
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff
K
ing
r
evisi
o
n
.
c: refacto
r
note
s
ref
e
xpansio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff K
i
ng
n
o
tes: ma
k
e exp
a
nd_notes_ref gl
o
ba
l
l
y
accessibl
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff
King
pull: do not
cl
o
bb
e
r un
t
racked fil
e
s on
i
nitial
p
u
ll
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff
Ki
n
g
merge:
m
e
rge
u
nborn index bef
o
re setting ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff Kin
g
t7607: cl
e
an up st
r
ay untracked file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
t7607: mark known breakage in tes
t
1
1
as fix
e
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-21
Jeff King
bisect: visualize with git-l
o
g if gi
t
k is
unavailable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
J
e
ff
K
ing
checkout: tw
e
ak de
t
ached-orphan warn
i
ng
f
ormat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
c
h
eck
o
ut: clear commit marks after detached-o
r
phan
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff K
i
n
g
check
o
ut: a
d
d basic te
s
ts for detached-orphan warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-13
Jeff King
docs: point git
.
txt auth
o
r credits to g
i
t-scm
.
c
o
m
commit
|
commitdiff
|
tree
2011-03-11
Jeff King
doc: add miss
i
ng git footers
commit
|
commitdiff
|
tree
2011-03-11
Jeff Ki
n
g
doc: drop
author/d
o
cume
n
tati
o
n
s
ecti
o
ns
f
rom
m
ost pages
commit
|
commitdiff
|
tree
2011-03-08
Jef
f
King
tra
c
e: give r
e
p
o
_setup trace its own key
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
J
e
f
f
King
add packet
tracing debug code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trac
e
: add t
r
ace
_
strbuf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
J
eff King
t
r
ace: factor out "do we want t
o
tr
a
c
e
" logi
c
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff
Kin
g
trace: refact
o
r to support multi
p
le env variables
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
J
eff
K
i
n
g
trace: add tr
a
ce_vp
r
i
ntf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff King
strbuf:
a
dd strbu
f
_vaddf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff King
co
m
pat:
provi
d
e
a fal
l
ba
c
k va_
c
opy definitio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-24
Jeff
Kin
g
format-
p
a
tch: rfc204
7
-enc
o
de newli
n
e
s
in header
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff K
i
n
g
fo
r
mat-patch: wrap long hea
d
er
l
ines
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff Ki
n
g
st
r
buf: add fix
e
d
-length
v
e
r
sion of
add_wrapped_text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff Ki
n
g
diff:
d
o
n't retrieve binary blobs for diffstat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff
King
d
iff: handle dif
f
stat
o
f rewritten
b
inary fi
l
es
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jef
f
K
i
ng
p
ull: pr
o
pagat
e
--progress
t
o mer
g
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
merge: enable progress
r
e
p
o
r
t
i
n
g
f
or r
e
name detection
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff
K
i
n
g
a
d
d
i
nexact ren
a
me detec
t
i
o
n progre
s
s
i
n
frastructure
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff K
i
ng
commi
t
: stop setting rename
limit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jef
f
Kin
g
bump rena
m
e limit
d
efa
u
l
ts (aga
i
n)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
m
e
rge: im
p
r
o
v
e
inexact re
n
ame limit warni
n
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-18
Jeff King
clone: d
i
e when tr
y
ing to clo
n
e mi
s
si
n
g l
o
cal path
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-14
J
e
ff Kin
g
string_l
i
st_app
e
nd: a
l
ways set util pointer
t
o NULL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
tests: sanitize mor
e
git
e
nvironment v
a
r
i
abl
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Je
f
f King
rebase: give a better err
o
r message for bogus branch
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebas
e
: us
e
explici
t
"--" wi
t
h chec
k
out
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-10
Jeff
K
ing
docs: explain
diff
.
*
.
bi
n
ary option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-20
Jeff King
ident: die on
bogus date
f
ormat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
J
e
f
f
King
t
2107: mark pa
s
sing test as
s
u
cc
e
s
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
Jeff King
h
a
ndle arbitrary ints in g
i
t_conf
i
g
_
maybe_
b
ool
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Jeff Ki
n
g
tests: fl
i
p executable
b
i
t on t915
8
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Jeff King
tests
:
add some script
l
int checks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-10
Jeff K
i
n
g
default color
.
status
.
branc
h
to "same as header"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
Jeff King
do
c
s: default
to more modern
t
oo
l
set
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next