repo.or.cz
/
git
/
mingw.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
J
e
f
f Kin
g
am: refresh th
e
index
at start an
d
--resolved
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-08-01
Jeff King
t7
4
0
0
:
fix bog
u
s
test failure with symlinked trash
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-07-06
Jeff King
d
o
c
s
:
do
c
ument
--textcon
v
diff
o
pt
i
on
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-06-17
Jeff
K
in
g
tests: link sh
e
ll
librar
i
es
i
nto v
a
lgrind directory
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-06-17
Jeff
K
ing
t/Makefile: pass
test opts
t
o v
a
lgrind target pro
p
erly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-31
Jeff
King
d
iff_tr
e
e: d
i
s
able
Q
U
ICK o
p
timiz
a
tion wit
h
diff filt
e
r
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-30
Jeff
K
ing
form
a
t-pa
t
ch: ma
k
e zero-length s
u
bje
c
t
p
ref
i
xe
s
prettier
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
r
ebas
e
: write a re
f
l
o
g entry
w
hen finishing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: fix some antiq
u
e e
x
a
m
ple
o
u
tpu
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: make sure l
i
t
e
r
a
l "->
"
isn't converted to a
r
r
o
w
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
J
eff K
i
ng
d
o
c
s
: up
d
ate status --porcelain
f
ormat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
J
e
ff King
d
o
cs: mi
n
or grammar fixes to git-status
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
J
e
ff K
i
n
g
format-patch: preserve su
b
j
ect newline
s
with -k
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
cle
a
n
u
p ca
l
ling convent
i
ons for prett
y
.
c
f
unctions
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
J
eff King
pretty
:
add pp_commit_e
a
sy fu
n
ction f
o
r s
i
mple callers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
ma
i
l
i
nfo: alw
a
ys clean up rf
c
822
he
a
der folding
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
t: test subject handling in for
m
at-patch / am pipeline
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff
King
read_in_f
u
l
l
: always re
p
or
t
e
r
r
ors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
r
emote: allow "-t" with fetch mi
r
rors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Je
f
f
K
ing
r
e
ad_gitfile_gently: use
s
size_
t
to hold
read resu
l
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
c
o
nfig:
alw
a
ys parse GIT_CONFIG_PAR
A
METERS du
r
ing git_config
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jef
f
King
git_config
:
don't p
e
ek at
g
lobal confi
g
_paramete
r
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
J
eff King
config: make
e
nvi
r
onment parsing routines
s
tatic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff
King
do
c
: d
i
scuss te
x
t
c
o
n
v v
e
r
s
us ex
t
ernal diff driv
e
rs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
combine-diff:
respect textcon
v
attributes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-23
J
eff King
refactor get_textconv to no
t
r
equire diff_filespec
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-23
Jeff Ki
n
g
c
ombine-diff: handle
b
i
nary
f
i
les
a
s binar
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-23
Jeff King
c
ombine-d
i
ff: calculat
e
mode_differs earlie
r
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-23
Jeff King
c
o
m
bine-diff: split header printing
into
its o
w
n func
t
i
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
receive-pack: eliminate duplicate
.
have
refs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
J
e
ff King
bisect: ref
a
c
tor sha1
_
array into a
g
ener
i
c sh
a
1
list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jeff K
i
n
g
refa
c
tor ref
s
_from_altern
a
te_cb
to allow passing extra
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
Makefile: sort TEST_PROGRAMS list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
fetch:
a
void rep
e
a
t
ed commits in mark_complete
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-18
Jeff King
test c
o
re
.
gitproxy configuration
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Ki
n
g
s
end-pac
k
: avoid d
e
adlock
on git
:
//
p
u
s
h
w
ith
f
a
iled
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Kin
g
connect: let callers
know if connec
t
ion is
a
s
o
c
ket
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
K
ing
c
onnect: treat generic
proxy proce
s
ses l
i
ke s
s
h
p
roc
e
sses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
t
350
3
:
test cherry picking and re
v
erting root commits
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
King
revert: allow revertin
g
a root commit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jef
f
Ki
n
g
cherry-pick: handle root co
m
m
i
ts w
i
th externa
l
s
t
rategies
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-10
Jeff
K
ing
t7501
.
8: feed a meaningful comma
n
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-09
Jeff King
blame: add
--li
n
e-porcelain
o
u
tput
format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-09
Jeff King
bl
a
me: refactor porcelain output
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-09
Jef
f
Ki
n
g
add tes
t
s f
o
r various blame
format
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-05
J
eff
K
i
ng
s
e
nd-pack: unbrea
k
pu
s
h over st
a
teless r
p
c
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merge-one-fi
l
e: fix broken
m
erges
w
ith alternat
e
work
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add tests fo
r
m
e
rge-index
/
merge-on
e
-file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-26
J
e
ff King
pretty:
quot
e
rfc82
2
spec
i
a
ls
in e
m
ail addresses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-14
Jeff King
format-patc
h
:
w
r
a
p
email
addresses after long name
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
u
p
load-p
a
ck: start pack-obje
c
ts b
e
fore asyn
c
rev-list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Je
f
f Ki
n
g
stash: drop di
r
ty worktree check
o
n
a
pply
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
J
e
ff King
sta
s
h: fix acc
i
dental apply of no
n
-existent sta
s
hes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-03
Jeff K
i
ng
pull
:
d
o
not
c
lobber untrac
k
ed
files on initi
a
l pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-01
Jeff King
do
c
s: fix
f
i
lter-bran
c
h subdir example for exoti
c
repo
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
r
e
mote:
d
e
pre
c
ate
-
-mirror
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff Ki
n
g
remote: sep
a
r
a
te
the c
o
ncept of push and fetch mirrors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff
K
ing
remote:
d
isal
l
ow so
m
e nonsensical option combi
n
at
i
o
n
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
tests:
k
il
l
backgrounded processes
m
ore robustl
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Je
f
f King
r
e
vis
i
on
.
c:
make
-
-no-
n
otes reset --notes list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff
K
ing
revision
.
c: sup
p
o
r
t --notes c
o
mmand-li
n
e option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff Kin
g
n
o
tes: r
e
factor disp
l
ay no
t
es def
a
ul
t
handling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jef
f
K
i
n
g
notes: ref
a
ctor dis
p
lay n
o
tes extra refs field
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
J
eff
K
in
g
revision
.
c: refactor notes
r
ef
e
x
pansi
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff King
no
t
es: make
ex
p
and_notes_r
e
f
g
l
obally accessible
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
pull: do not clobber untr
a
cked files on in
i
tial pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
merge: mer
g
e unborn index befor
e
setting r
e
f
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff K
i
ng
t
7607: cl
e
an up stra
y
unt
r
ac
k
ed file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
J
eff King
t7607: ma
r
k known
breakage in
t
e
s
t 11 as fixed
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-21
Jeff Kin
g
bisect:
v
i
sualize with git-log
i
f gitk is u
n
availa
b
le
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
ch
e
ckout: tweak d
e
tached-orpha
n
warning format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
J
e
ff King
chec
k
out:
clear
c
ommit
marks after de
t
a
c
h
ed
-
orphan
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff Ki
n
g
c
heckout:
a
dd ba
s
ic tests for detached-o
r
phan warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-13
Jeff King
docs: p
o
i
nt gi
t
.
txt author credits to git-scm
.
com
commit
|
commitdiff
|
tree
2011-03-11
J
e
ff King
doc: add missin
g
git foo
t
ers
commit
|
commitdiff
|
tree
2011-03-11
Jeff King
doc: drop author/
d
ocumentation
s
ections fr
o
m
m
ost pag
e
s
commit
|
commitdiff
|
tree
2011-03-08
J
eff King
trace: g
i
ve repo_setup trace its own k
e
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
add packet
tra
c
in
g
debug code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
tra
c
e: add trace_st
r
buf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
J
e
ff King
trace: factor out "do we want to
trace" logic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff Kin
g
trace: refac
t
or to s
u
pport
multiple e
n
v var
i
abl
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace: add trace_vprin
t
f
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
J
e
ff
K
ing
strbuf
:
ad
d
strbuf_
v
a
d
df
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Je
f
f
King
compat:
p
rovide a fallback va_c
o
p
y
d
e
finition
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-24
Jeff King
format-
p
atch: rfc204
7
-enco
d
e ne
w
l
ines
in headers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff
K
i
ng
form
a
t-patch: wrap long header lines
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff
K
i
ng
strbu
f
: add fixed-length vers
i
on of a
d
d
_
wrapped_tex
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jef
f
King
d
i
ff: don't retrieve bina
r
y
blobs for d
i
ffstat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff King
di
f
f: handl
e
diffs
t
at of rewritten
b
i
n
a
ry files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
J
ef
f
Kin
g
pull: prop
a
g
at
e
--
p
rogress to merge
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
J
eff King
merge: enab
l
e progress reporting
for r
e
name detection
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
J
e
ff K
i
ng
add inexact rename det
e
ction
p
rog
r
es
s
infrastructure
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff
King
commit: stop set
t
ing renam
e
l
i
mit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
bump rename limi
t
defa
u
lts (a
g
ai
n
)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
J
e
ff King
m
e
rge: improve inexact
rename lim
i
t
w
arni
n
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-18
J
e
ff K
i
ng
clone:
die
w
hen t
r
ying to c
l
one miss
i
ng lo
c
a
l path
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-14
Jeff King
s
t
ring
_
list_append: always set util pointer to N
U
LL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
tests: sanitize more
g
it environm
e
nt
va
r
i
a
b
l
es
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebase: give a bett
e
r
er
r
or
messag
e
for bogus branc
h
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
J
e
ff King
rebase: use expl
i
cit "--" with checkou
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next