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 'th/bisect-skip-report-range-fix'
2013-05-28
John Keep
i
ng
fetch: don't t
r
y to update unf
e
tched tracking ref
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
Joh
n
Keeping
difftool: fi
x
dir-di
f
f w
h
en fil
e
does not e
x
ist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
J
o
hn
Keeping
merge-tre
e
:
ha
n
dle di
r
ecto
r
y/empty conflict
correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
Jo
h
n Keeping
t
/Mak
e
fil
e
: don't de
f
ine T
E
ST_R
E
SULTS_DIREC
T
ORY recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John K
e
eping
c
o
ntrib/subtree: don't delete remo
t
e br
a
nches if spl
i
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Kee
p
ing
t
est outpu
t
: res
p
ect $TEST_OU
T
PUT_DIRECTO
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keepin
g
t/Makefile:
r
emove smok
e
test
targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merge
-
t
r
ee
:
fix t
y
p
o in "both changed ident
i
c
a
l
ly"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keep
i
ng
t/Ma
k
efile: fix result handling
wi
t
h T
E
ST_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepi
n
g
tra
n
spo
r
t-helper: add 's
i
gned-tags' cap
a
bility
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
e
ping
transport-helper: pass --si
g
ned-tags=warn
-
s
t
rip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-export: ad
d
-
-
s
i
gned-tags
=
w
arn-s
t
r
i
p mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Ke
e
ping
t
/
t
est-lib
.
sh: f
i
x
TRASH_D
I
RE
C
TORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
mer
g
e-tree: do
n
'
t p
r
int entries that
m
atch "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keep
i
ng
gitrem
o
te-helper
s
(
1
)
: cl
a
r
i
fy r
e
f
spec beh
a
viour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
sub
m
o
d
ule: p
r
in
t
gra
p
h
output next to s
u
b
m
o
dule lo
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
d
iff: allow uns
t
uck argume
n
ts with --diff
-
algo
r
ithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
git-
m
erge
(
1): do
c
u
m
ent diff-algorithm o
p
ti
o
n to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn Keeping
bisect: avoid s
i
gned
in
t
eger overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keepi
n
g
diffcore-break
:
d
o
n't
div
i
d
e by zer
o
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keeping
t7800:
ru
n
--dir-dif
f
tests with and without s
y
m
l
i
n
ks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
K
e
eping
t780
0
: f
i
x tests w
h
en d
i
fftool uses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
t780
0
: don't hide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keeping
difftool:
d
o
n't
overwrite modif
i
ed files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
t7800: move '--sy
m
link
s
' specifi
c
te
s
t to the
end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
oh
n
Keeping
me
r
ge-tree: f
i
x ty
p
o in merge-tree
.
c::unres
o
l
v
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
J
o
hn K
e
eping
refs
.
c: fix fread error hand
l
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entr
y
:
fix filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
pin
g
t2
0
03: mo
d
e
r
niz
e
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keepin
g
difftool --dir-diff: s
y
ml
i
nk all fil
e
s matc
h
ing the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
diff
t
o
o
l: avoid dou
b
le
s
la
s
hes in sy
m
link targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
p
in
g
git-difftool
(
1
)
: fix forma
t
ting of --symlink
descr
i
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
J
o
h
n Kee
p
ing
R
evert
"graph
.
c: mark pri
v
ate fil
e
-scope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John
Keeping
Makefile:
make m
a
ndir,
h
t
mldir a
n
d infod
i
r
absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
rebase -i:
r
espect core
.
commentcha
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
combine-diff
.
c: teach comb
i
n
e
d
d
iffs abou
t
l
i
ne prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
dif
f
.
c: us
e
diff_line_pre
f
i
x() wh
e
re
a
pplic
a
ble
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
diff:
add
diff_
l
ine_prefix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
d
i
f
f
.
c: mak
e
con
s
tant stri
n
g ar
g
uments
c
o
n
s
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: write pref
i
x to th
e
correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
graph: outp
u
t
padd
i
ng for merge subseq
u
ent
p
a
rents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t
4038:
a
dd tes
t
s for
"
diff --cc --raw
<trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
Kee
p
ing
buil
t
in/apply: tighten
(
dis)simil
a
rity index parsin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keep
i
ng
m
ergetool--lib: list
user configured tools
i
n '--
t
ool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
R
ename {git- => gi
t
}
remote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Kee
p
in
g
CodingGuidelines: add Python c
o
d
i
ng guideline
s
commit
|
commitdiff
|
tree
2013-01-28
J
o
h
n Kee
p
in
g
git-rem
o
te-testpy: fix path
h
ashing on Py
t
hon
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
J
o
hn K
e
eping
mergetool--lib: don't c
a
l
l "exit
"
in set
u
p_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git-di
f
ftool:
use g
i
t-merget
o
ol--lib for "--t
o
ol-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Ke
e
ping
gi
t
-me
r
ge
t
ool: do
n
't hardcode 'mergetool' in sho
w
_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
K
e
e
ping
git-merg
e
tool: remove redund
a
nt assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git-m
e
rgetool: move show
_
to
o
l
_
help to merget
o
ol--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
K
e
eping
git-re
m
ot
e
-
tes
t
py: call print as
a
functio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
n
g
git-
r
emote
-
te
s
tp
y
:
don't do
unbu
f
f
ered text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git
-
remote-testpy:
h
ash byt
e
s explicitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
svn-fe: allow svnrdump_sim
.
py to
r
un with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git_re
m
ote_helpers: use 2t
o
3 if building with
P
y
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keepi
n
g
g
i
t_remote_helper
s
: force r
e
build if python version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Ke
e
pi
n
g
gi
t
-
c
vsimport
.
txt:
cvsp
s
-2 is deprecat
e
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
Joh
n
Keepin
g
git-f
o
r-each-ref
.
txt: 'r
a
w' is a sup
p
o
r
t
ed date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_remote_he
l
pers: fi
x
i
nput when running u
n
d
e
r
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
ohn Ke
e
pi
n
g
git_remote_helper
s
:
a
llow
b
uildi
n
g with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keeping
git
-
svn: teach fin
d
-rev to find n
e
ar matc
h
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
Jo
h
n K
e
epi
n
g
gi
t
-fast-impo
r
t(1): reo
r
g
anis
e
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
o
h
n Keepin
g
git-fas
t
-i
m
port(1):
co
m
bine documentati
o
n
of --[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
o
hn Keep
i
ng
g
i
t-sho
r
t
l
og(1
)
: docum
e
nt be
h
aviour of zero-w
i
dth w
r
ap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keeping
git-
f
as
t
-im
p
o
rt(1): remo
v
e dupl
i
cate '--do
n
e'
o
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John
K
eeping
Documentation: do
n
't
l
ink
to example
m
ail
a
d
d
resses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Keeping
reba
s
e -i
c
onti
n
ue:
don't skip comm
i
ts that
o
nly change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree