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
Jeff King
am:
ref
r
esh the inde
x
at start and --reso
l
ved
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-08-01
Jeff King
t7400
:
fix bogus t
e
st fail
u
re
w
ith syml
i
nked trash
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-07-06
Jef
f
K
i
ng
docs: document --text
c
onv diff
o
ption
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-06-17
J
e
ff
King
tests: link s
h
ell
l
i
b
r
a
r
ie
s
i
nto valgrind
dir
e
ctor
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-06-17
Je
f
f
K
ing
t/Makef
i
le: pass test o
p
ts
to valg
r
ind target properl
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-31
Jeff Ki
n
g
diff_tree: disable QUICK optimization w
i
th dif
f
f
il
t
er
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-30
Jeff
K
ing
f
o
rmat-p
a
tch: make z
e
ro-length su
b
ject prefixes pretti
e
r
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
reb
a
se: wr
i
te a
re
f
log entry when finishing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
J
eff
King
d
ocs: fix som
e
antique exam
p
le out
p
ut
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jef
f
King
d
oc
s
: make sure
l
ite
r
al "->"
isn't converted to arrow
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jef
f
King
docs:
u
pdate status
--porcelain format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jef
f
King
docs: m
i
nor grammar fixes to git-status
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Je
f
f King
fo
r
mat-patch: preserve subj
e
c
t newlines with
-
k
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
J
eff King
clea
n
up
c
al
l
ing conventions for
p
re
t
ty
.
c functio
n
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
prett
y
: ad
d
pp_commit_easy func
t
ion fo
r
s
im
p
l
e
callers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
mailinfo: always clean up rfc82
2
header
f
o
l
d
in
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Je
f
f
K
ing
t: tes
t
subject handling in fo
r
mat-p
a
tch /
a
m
p
i
pe
l
ine
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
J
e
ff
King
re
a
d
_i
n
_full: alwa
y
s report er
r
ors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff Ki
n
g
remote: allo
w
"
-
t
" with
f
etch mirrors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff
K
i
n
g
r
e
a
d_gitfile_gently: use ssize_t
t
o
h
o
l
d read
result
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff Ki
n
g
config
:
a
l
ways parse
G
IT_CONFIG_PARAMET
E
RS during git_co
n
f
ig
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
git_co
n
fig: don
'
t peek at global
c
onfig_
p
a
rame
t
ers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff Ki
n
g
con
f
i
g: make e
n
viron
m
en
t
parsing routine
s
sta
t
ic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
doc: discuss textconv ve
r
sus external di
f
f drivers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
com
b
i
n
e-diff:
r
espect t
e
xtconv attribu
t
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-23
Jeff K
i
ng
r
efactor
g
et_textco
n
v to
n
ot requ
i
re diff_filespec
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-23
Jeff King
combine-diff: handle binary
files as binary
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-23
Jeff King
c
o
mbine-d
i
ff: calculate mode_di
f
fers
earlie
r
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-23
Jeff King
c
o
mb
i
n
e-diff: split header printi
n
g into its own function
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
J
e
ff King
receive-pack: eliminate duplic
a
te
.
have r
e
fs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
bise
c
t:
r
e
factor sha1_arr
a
y int
o
a generic sha1 l
i
st
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
J
eff King
refactor refs_from
_
alternate_cb to allow
passing extra
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jeff
King
M
akefi
l
e:
sort
T
ES
T
_PR
O
G
RAMS list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jef
f
Kin
g
fetch: avoid repea
t
ed commits in mar
k
_c
o
mple
t
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-18
J
eff King
test core
.
gitproxy configurati
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Je
f
f King
send-pack: avoi
d
deadl
o
ck
on git:// push w
i
th f
a
i
led
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
connect: l
e
t callers kno
w
if c
o
nnection
is
a socket
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
connect
:
treat
gen
e
ric proxy
pro
c
e
sses like ss
h
proces
s
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
J
ef
f
Ki
n
g
t3503: tes
t
cherry pickin
g
and rever
t
ing root c
o
mmits
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff King
reve
r
t:
allow
reverting
a
root commi
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff K
i
ng
cherry
-
pick: hand
l
e root commits with external strategies
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-10
J
e
ff King
t7501
.
8
:
feed a meaningf
u
l command
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-09
Jeff Ki
n
g
bl
a
me:
add --li
n
e
-po
r
celain output format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-09
J
eff
K
ing
blame: refa
c
tor porcel
a
in ou
t
put
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-09
Jeff
K
ing
add
tests for
various
b
lame formats
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-05
Jeff K
i
n
g
send-pack: unbreak p
u
sh over stateless rpc
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Jef
f
Kin
g
m
erge
-
o
ne-file
:
f
ix broken merg
e
s
wit
h
alternate work
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add tests for merge-index / merge-one-file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-26
J
e
ff
K
ing
p
r
e
tty: quote
rfc822 spe
c
ia
l
s
in e
m
a
il addresses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-14
Jeff Ki
n
g
format
-
patch: wrap email addresses
a
f
ter
l
o
ng nam
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
J
e
ff King
upload-pack
:
s
tart pack-
o
bj
e
cts b
e
fore a
s
ync r
e
v-
l
ist
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash: drop d
i
rty wo
r
ktree check on apply
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash:
f
i
x accident
a
l apply of non-existent
s
tashes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-03
J
eff
King
pu
l
l: do n
o
t clo
b
ber untracked f
i
les
o
n initial p
u
ll
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-01
Jeff King
docs: fi
x
filter-branc
h
subdir example for exotic repo
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Je
f
f King
remote:
d
e
p
recate --mirror
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
J
eff K
i
ng
remote: sepa
r
ate
t
he concep
t
of push
and fetch mirro
r
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
J
e
ff K
i
n
g
r
emote: disall
o
w some nonse
n
sical option combina
t
io
n
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff
King
tests: kill b
a
c
kgrounde
d
proces
s
e
s
m
o
r
e
r
obust
l
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff Kin
g
revision
.
c: m
a
k
e
--no-notes res
e
t --no
t
es list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff King
revi
s
ion
.
c: support --notes command-lin
e
option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff King
notes: refactor display note
s
default handling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jef
f
King
notes: refactor dis
p
lay notes extra
r
ef
s
f
i
e
ld
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Je
f
f
K
ing
revision
.
c: refactor notes ref expan
s
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff King
notes:
m
ak
e
exp
a
nd_notes_ref
globall
y
ac
c
es
s
i
ble
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
pull:
d
o not
c
l
o
bber untr
a
cked
f
ile
s
on initi
a
l pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
m
e
rge:
merge unborn in
d
ex bef
o
re setting
r
e
f
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
t7607: c
l
ean up s
t
ray untracked file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
t7607: m
a
rk known breakage in test
1
1
as fix
e
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-21
Jeff King
b
i
sec
t
: vi
s
ual
i
ze with git-lo
g
if gitk is unavailable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
checkout:
t
weak detached-orp
h
an wa
r
ning fo
r
mat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff Ki
n
g
checkout: cle
a
r commit mar
k
s aft
e
r detached-o
r
phan
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
J
e
f
f
Kin
g
c
h
e
c
k
o
u
t
:
add basic
t
e
s
t
s
for detached-orphan warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-13
Jeff King
docs: point
g
it
.
txt a
u
t
hor cred
i
t
s
t
o
git-scm
.
c
o
m
commit
|
commitdiff
|
tree
2011-03-11
Jeff King
d
o
c
:
a
d
d
missi
n
g gi
t
footers
commit
|
commitdiff
|
tree
2011-03-11
J
e
f
f King
doc: drop author/documenta
t
i
o
n sections fr
o
m most pages
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trac
e
:
give repo_
s
etup trace its o
w
n key
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
J
eff
King
add packet tracing
debug code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace:
a
dd tr
a
ce_str
b
uf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
t
race:
f
a
c
tor out "do we want to trace
"
l
ogic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Je
f
f
King
tra
c
e: refactor to
s
upport m
u
ltiple env
variables
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
t
r
ace: a
d
d trac
e
_vpri
n
tf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Je
f
f Ki
n
g
strbuf: a
d
d strbu
f
_vaddf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff
Ki
n
g
c
o
mpat:
p
r
o
vid
e
a fallback va_copy definitio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-24
Jeff King
format-patch: rfc2047-encode newline
s
in
headers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Je
f
f King
format-patch: wr
a
p
l
o
ng header
l
ines
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff King
strbuf: add fixed-length
version
o
f add_wrapped_text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff
King
dif
f
: don't retrieve binary blobs
f
o
r di
f
fstat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff
K
i
n
g
dif
f
: h
a
ndle
diffstat o
f
rewritt
e
n binary
f
il
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
J
eff King
pull: p
r
o
p
agate
-
-progress to me
r
ge
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
merge: en
a
bl
e
prog
r
ess reporti
n
g
for
r
ename
detecti
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
add inexact rename detecti
o
n progre
s
s infr
a
structu
r
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
commi
t
: s
t
o
p
setting rename l
i
mit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
bu
m
p rename l
i
m
it
defaults
(again)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff
K
i
n
g
merge: improve
in
e
xact rename limit warn
i
ng
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-18
J
e
ff Ki
n
g
clone: die
w
h
e
n
trying to clon
e
missing local path
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-14
Jeff King
str
i
n
g
_list_
a
ppend:
a
lways
s
e
t util p
o
in
t
er to NULL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff Ki
n
g
te
s
ts: s
a
nitize mo
r
e git environm
e
nt va
r
i
able
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebase: give a bette
r
error mes
s
ag
e
for b
o
gus br
a
n
c
h
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
J
eff
K
ing
rebase: u
s
e explicit "--"
w
i
th chec
k
out
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next