repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/checkout-reflog-fix' into maint
2011-08-16
Jeff Kin
g
am: refr
e
sh the
i
ndex at start
and --r
e
solved
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-08-01
Je
f
f King
t
7400: fix bogus test
f
ailure with symlink
e
d
t
rash
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-07-06
Jef
f
Kin
g
d
o
cs: doc
u
ment --t
e
xtconv
d
iff option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-06-17
Jeff King
tests: link shell libraries in
t
o va
l
grin
d
directory
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-06-17
Jeff Ki
n
g
t/
M
akefile: pas
s
test opts
to valg
r
ind
t
ar
g
et properly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-31
Jeff King
diff_t
r
ee: disable QUICK optimiza
t
ion with
diff
f
ilter
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-30
J
e
f
f King
format-
p
atch: make zero-
l
ength subject
p
r
efixe
s
prettie
r
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
J
e
ff King
rebase
:
writ
e
a reflog
e
ntry when finishing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff Kin
g
docs: fi
x
some antiq
u
e example output
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: make
s
ure literal "
-
>" isn't conv
e
rted to arrow
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff Ki
n
g
docs: update s
t
atus --porcelain for
m
a
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff K
i
ng
doc
s
:
m
inor grammar fixes to git-status
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff Kin
g
f
o
r
ma
t
-pa
t
ch: preserve s
u
bject ne
w
lines with -k
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
clean up ca
l
ling conventions fo
r
pretty
.
c fu
n
c
t
ions
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff
K
ing
pr
e
tty: add pp_commit_ea
s
y
function for simple c
a
llers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jef
f
King
m
aili
n
f
o
:
always
clean up rfc822 header fol
d
ing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff
K
ing
t:
t
es
t
subject handling in f
o
rmat-patch /
a
m pipeline
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
rea
d
_
i
n
_ful
l
: always repo
r
t error
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
remote: allow "-t" with fe
t
ch mirrors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
read
_
gitfile_ge
n
tly: use ssize
_
t to hol
d
read result
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
J
eff K
i
n
g
conf
i
g: always parse GIT_
C
ON
F
IG_PARAMETERS
d
u
ri
n
g git_conf
i
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Je
f
f King
g
it_confi
g
: don't peek at
g
lobal
c
o
n
fig_paramete
r
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
con
f
ig: make envir
o
nm
e
nt parsi
n
g routin
e
s static
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
J
eff Kin
g
d
o
c: discuss t
e
xtc
o
nv versus
e
xte
r
n
a
l diff
driver
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
combine-dif
f
: respect textcon
v
attributes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-23
Jeff K
i
ng
r
e
factor get_t
e
xtco
n
v to
not require diff
_
f
i
l
espec
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-23
Jeff Ki
n
g
combine-diff
:
handle bina
r
y files as binary
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-23
Jeff King
combine-d
i
ff: ca
l
culate
m
ode_differs
earlier
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-23
Jeff King
c
ombine-d
i
ff: sp
l
i
t header printi
n
g into its own function
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
receive-pa
c
k: eliminate
d
uplica
t
e
.
hav
e
ref
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jef
f
King
bisect: r
e
factor sha
1
_arra
y
into a gen
e
ric
s
ha1 list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
refact
o
r refs_from_alternate_cb
t
o
a
llow pas
s
i
ng e
x
tra
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
J
e
ff King
Make
f
ile: sort TEST_
P
ROGRAMS lis
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
J
eff King
fetch: avo
i
d repe
a
t
e
d
commits in mark_complete
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-18
Jeff King
test core
.
gitproxy
configuration
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
J
eff King
send-p
a
ck: av
o
id
deadlock on g
i
t://
push
with failed
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
co
n
nect: let callers know if co
n
nection
i
s a s
o
c
ket
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
c
onnect:
treat
g
e
neric p
r
oxy
p
roc
e
sses like
ssh proc
e
sses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
t3503: test cherry
picking and re
v
e
rt
i
ng root commits
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
revert: al
l
o
w
r
e
vert
i
ng a r
o
ot c
o
mmit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
J
eff King
c
herry-p
i
c
k
: handl
e
r
oo
t
c
o
mm
i
ts with external strate
g
ies
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-10
Je
f
f King
t7501
.
8: feed a mea
n
ingful
command
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-09
Je
f
f
K
in
g
blame: add --line-porcelain outp
u
t format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-09
Jeff K
i
n
g
blame: refact
o
r porcelain outpu
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-09
Jeff King
ad
d
t
e
sts for various blame
f
ormats
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-05
Jeff King
s
end-
p
ack: u
n
break pus
h
over st
a
tele
s
s rpc
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
J
e
f
f Ki
n
g
merge-one-file: fix broken merges with alternat
e
work
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Jef
f
King
ad
d
tes
t
s for merge-index /
merge-one-file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
p
retty: quote r
f
c822 s
p
ec
i
als
in
email addresses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-14
Jeff King
format-
p
atch
:
wra
p
e
m
ail addre
s
se
s
after
l
ong names
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff Kin
g
u
p
l
oad-pack
:
s
t
a
rt
p
ack-objects
b
efore async rev-list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
J
e
ff King
stash: drop
d
irty worktree check
o
n ap
p
ly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff Ki
n
g
stash: fix accidental a
p
p
ly of non-existen
t
st
a
shes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-03
Jeff King
p
ull: do
not
c
lobber unt
r
acked fil
e
s
on initial
pul
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-01
J
e
f
f
King
docs: fix filter-br
a
nc
h
s
u
b
dir examp
l
e for
e
xot
i
c re
p
o
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jef
f
King
remote: deprecate --mi
r
ror
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
rem
o
t
e
: s
e
pa
r
a
te th
e
c
o
ncept of push and fetch
m
irrors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff K
i
ng
rem
o
te: dis
a
llow
some nons
e
nsical o
p
tion comb
i
nations
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
tests: k
i
ll backgrounded process
e
s
more robustly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
J
e
ff King
revision
.
c: make -
-
no-notes reset --notes list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Je
f
f King
revi
s
ion
.
c: sup
p
o
rt --n
o
tes command
-
lin
e
option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Je
f
f King
notes: refactor display
n
o
t
es d
e
f
ault handling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff Kin
g
notes
:
refactor display not
e
s ex
t
ra refs field
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Je
f
f Ki
n
g
rev
i
sion
.
c: refactor not
e
s re
f
expansion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff King
note
s
: make expan
d
_
n
otes_ref globally ac
c
essi
b
l
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
J
eff King
p
ul
l
:
d
o not clobbe
r
untra
c
ked
f
iles
o
n initial pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff
King
mer
g
e: merge unborn
index
b
efor
e
s
etting ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jef
f
King
t
7607:
c
lean up stray untracke
d
file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
t7607: m
a
rk kn
o
wn breakage in te
s
t
1
1
a
s
fixe
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-21
J
eff King
bi
s
ect: visualiz
e
with git-log if gitk is unavailable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff Ki
n
g
checkou
t
: tweak det
a
ched-
o
rphan warning form
a
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
che
c
ko
u
t: clear co
m
mit mark
s
after detache
d
-
orphan
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff
K
i
n
g
checkout: add bas
i
c tests for
d
etached
-
orphan warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-13
Jeff King
d
o
cs: point git
.
txt
a
uthor cr
e
dits to gi
t
-sc
m
.
com
commit
|
commitdiff
|
tree
2011-03-11
Jeff King
doc: add missing git foot
e
rs
commit
|
commitdiff
|
tree
2011-03-11
Jeff Ki
n
g
doc
:
dro
p
author/d
o
cument
a
t
i
on sections f
r
o
m
m
ost pages
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace: g
i
ve repo_setup trace
i
ts own key
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
ad
d
packet traci
n
g de
b
ug
code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Je
f
f King
t
r
ace: add trace_strbuf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff K
i
ng
tra
c
e: f
a
ctor o
u
t "d
o
we want to trac
e
" l
o
gic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace: refa
c
tor
t
o suppo
r
t
m
ultiple e
n
v v
a
riables
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace: add t
r
ac
e
_vprint
f
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
J
eff King
strbuf: add strbuf_vaddf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jef
f
K
ing
com
p
at: p
r
ovide a fal
l
b
a
ck va_copy definition
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-24
Jeff Kin
g
format-patch:
r
f
c2047-encode newl
i
nes i
n
he
a
de
r
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff Kin
g
format-p
a
tc
h
: w
r
ap long
h
e
ad
e
r lines
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff K
i
ng
strbuf: a
d
d fixed-lengt
h
v
e
rsio
n
of add_w
r
apped_te
x
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
J
eff King
diff:
don't retrieve binar
y
blobs
f
or
d
iffstat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
J
e
ff King
di
f
f: handle
d
iff
s
t
a
t of rewr
i
t
ten binary fil
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jef
f
K
in
g
pu
l
l:
propag
a
te
-
-
pr
o
gress to merge
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
J
eff King
mer
g
e
: enable progress
r
eporting f
o
r rena
m
e
d
etection
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jef
f
King
add inex
a
c
t
r
ename dete
c
t
ion progre
s
s infrastruc
t
ure
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Je
f
f King
co
m
m
it:
stop
s
ett
i
n
g
rename limit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff Kin
g
bump rename limit def
a
u
l
ts (again)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
me
r
ge
:
improve inexa
c
t
rename limit wa
r
ning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-18
Jeff Ki
n
g
clone: die w
h
en tr
y
i
n
g to clone missing
local path
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-14
Jeff
K
ing
str
i
ng_
l
ist_appe
n
d
:
always set util point
e
r to NULL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff Kin
g
tests: sanitize mo
r
e git
environment va
r
iables
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff Kin
g
rebas
e
: give a better error message
f
or bogus branch
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff
K
i
n
g
r
ebase: u
s
e explicit "--" with checkout
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next