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 'maint-1.8.2' into maint-1.8.3
2013-07-03
J
o
hn Keeping
git-
c
o
n
f
ig: update doc
for --get
with
m
u
l
tiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
diffto
o
l
:
fix dir
-
diff
when f
i
le does not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
Jo
h
n Keeping
merge-
t
ree: h
a
ndle director
y
/empty
c
onflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John K
e
eping
contri
b
/subtre
e
:
d
o
n
't delete remote bra
n
c
h
es if spli
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefile: remove
s
mok
e
tes
t
targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John
K
eeping
me
r
ge-
t
ree
:
fix typ
o
in "both changed iden
t
i
c
ally"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
e
p
i
n
g
t
r
a
nsport-helper: add 'si
g
n
ed
-
t
ags' capab
i
lity
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
tra
n
sport-helper: pass --signed-tags=warn-stri
p
to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
ng
fast
-
export: a
d
d
--signed
-
tags=warn-strip
mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/test-l
i
b
.
sh: fi
x
TRASH_
D
IRE
C
TORY handli
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
Jo
h
n Keeping
m
erge-tree: don't print entries that
m
a
t
ch "lo
c
al"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John
K
e
epin
g
g
i
tremote-help
e
rs(1): clarify re
f
sp
e
c
be
h
a
v
iour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Ke
e
ping
subm
o
dule: print
g
rap
h
out
p
u
t nex
t
to
submodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keep
i
ng
diff
:
allow u
n
stuck argum
e
nts with --diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Kee
p
ing
git-merge(1): document diff-algo
r
ithm o
p
tion to
merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
h
n
K
eep
i
ng
bise
c
t: avoid signed
integer ov
e
rfl
o
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
d
iffcore-break: don'
t
divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keeping
t
780
0
: ru
n
--dir-di
f
f tests with an
d
wi
t
hout symlin
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
t
7800
:
f
i
x tests w
h
en difftool us
e
s
-
-no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7
8
0
0
: don
'
t hide g
r
ep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keep
i
ng
difftool: don't overwrite
m
odified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t78
0
0: move
'
--
s
ymlinks' spec
i
fic test
to th
e
en
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keepin
g
merge-t
r
ee: fix typo in merge-tr
e
e
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
Joh
n
Ke
e
p
i
ng
refs
.
c: fix fread err
o
r handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entr
y
: fix filte
r
loo
k
up
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2003: moder
n
i
ze style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Ke
e
pi
n
g
difftool --
d
ir-diff:
s
ymlink all f
i
les matc
h
ing the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepi
n
g
d
ifftoo
l
:
avoid d
o
ub
l
e s
l
ashes in symlink t
a
rgets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n
Keeping
g
i
t-difftool(1): fi
x
format
t
i
n
g of -
-
symlin
k
descri
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John
K
e
eping
Revert "graph
.
c: mark private file-scope symbol
s
as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
o
hn Keeping
M
a
ke
f
ile: make mand
i
r, htmldir and infodir abs
o
lut
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
rebase -i: respect cor
e
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
combine-diff
.
c: teach comb
i
ned
d
iffs about line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n Keepi
n
g
diff
.
c: use diff_line_prefi
x
(
) where applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
di
f
f
:
add diff_line_pr
e
f
i
x function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
d
i
f
f
.
c:
make cons
t
ant string
a
r
g
uments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
i
n
g
diff: writ
e
prefix to the cor
r
ect
fil
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
Joh
n
Keeping
graph: output
padd
i
ng f
o
r me
r
g
e
s
ubsequent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
o
hn Ke
e
pi
n
g
t
4
038: add tests
fo
r
"
d
i
ff -
-
cc --raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
ohn
Ke
e
ping
bu
i
ltin/apply: tighten (di
s
)si
m
ilarity i
n
dex parsin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
mergetool--lib: l
i
st
us
e
r
c
onfigure
d
tools
i
n '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John
Ke
e
ping
R
e
name {git-
=
>
git}remot
e
-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
ohn Keeping
CodingG
u
idelines: ad
d
P
y
thon coding g
u
id
e
lines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
g
it-remote-testpy: fix path ha
s
hing on Pyth
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John K
e
e
p
i
n
g
m
erge
t
oo
l
--lib:
don't call "exit" in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git-difftool
:
use git-mergetool--lib for "--to
o
l
-h
e
lp"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
pin
g
git-m
e
rg
e
tool: don't hardcode 'mergetool' in show_
t
o
o
l_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
gi
t
-m
e
rgetool: r
e
move redundant assign
m
e
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git-mergetool: move
show
_
too
l
_hel
p
to merg
e
to
o
l--
l
i
b
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git-remote-tes
t
py: c
a
ll print
as a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n
Keeping
git
-
remot
e
-testpy: don't do unbuffered text I/
O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
pi
n
g
git-remote-
t
estpy: hash byt
e
s explicit
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
sv
n
-fe: a
l
low svnrdump_sim
.
p
y t
o
run wit
h
Py
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git
_
remote_h
e
lp
e
rs: u
s
e
2to3 if b
u
ilding wi
t
h Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_r
e
mote_hel
p
ers: f
o
rce rebuild
i
f
p
ython ve
r
s
i
on
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
J
o
hn
K
eeping
git-cvs
i
mport
.
txt:
c
vsps-2 is deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keepi
n
g
git
-
for-
e
ach-ref
.
txt:
'raw' is a supported
d
a
te format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git
_
r
emote_hel
p
ers: fi
x
in
p
ut when running un
d
er Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
ohn Keeping
git_remot
e
_helpers: allow
bui
l
ding wi
t
h
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John
Keeping
git
-
svn: teach fi
n
d
-
rev
to find ne
a
r
m
atche
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
g
i
t-fast
-
im
p
o
r
t(1)
:
reorganise options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-f
a
s
t-imp
o
rt(1): combine documentation of
-
-[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keepin
g
git-shortlog(
1
):
d
ocu
m
ent
b
e
h
a
viour of zer
o
-width
w
rap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
J
ohn Ke
e
ping
git-fast-i
m
port(1): remove
d
up
l
icate '--done' o
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John Keeping
Documentation: don't link to e
x
ample mail add
r
esse
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Keeping
reba
s
e -i continue: don't skip
com
m
its tha
t
on
l
y
c
ha
n
ge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree