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
rebase: fix fork-point with zero arguments
2014-01-09
John
K
ee
p
ing
rebase: fix fork-point w
i
th zero argume
n
ts
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-12-10
Jo
h
n Keeping
rebase: use
r
eflog
to find common base with upstream
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-12-09
John
K
eepi
n
g
pull: use merge-base --fork-po
i
n
t
when appropriat
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-10-03
John Keepin
g
D
ocument
a
tion/
M
a
kefile: make As
c
iiDoc db
l
atex dir
c
o
n
figurable
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-26
John K
e
eping
merge-
r
ecursive: f
i
x par
s
ing of "diff-
a
lgorithm" op
t
ion
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-13
John Keepi
n
g
reset:
h
andle s
u
b
module with trailing slash
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-13
J
o
hn Keeping
rm: re-use parse_
p
athspec's trailing-slash removal
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-09
Joh
n
Keeping
git_remote_
h
elpers:
r
emove l
i
t
tl
e
used Python lib
r
ar
y
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-22
J
ohn
K
eepin
g
r
e
v-pa
r
s
e(1): logically g
r
oup
o
ptions
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-22
J
o
hn
K
eeping
rev-parse:
rem
o
ve r
e
strictions on some options
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-08
J
o
hn Keeping
pull: change the description to "integrate" changes
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
John Keep
i
ng
push: avoid sugg
e
sting "merging" remote
c
hanges
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
Jo
h
n Keeping
g
i
t-config(1): clarify pr
e
c
edence of
mul
t
i
p
le values
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
gi
t
-con
f
ig:
up
d
ate doc for -
-
get with mul
t
ip
l
e values
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-30
Joh
n
Keeping
com
p
letion
:
le
a
rn
a
bout --man-path
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-30
John
K
eeping
co
m
pletion: ha
n
dle unstuck form
o
f bas
e
git options
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fa
s
t
-import:
allow moving the root
t
ree
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fa
s
t
-
i
m
port: a
l
low ls o
r
file
c
opy of the root tree
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-impor
t
: set valid mode on r
o
ot tree in
"
l
s
"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John Kee
p
i
n
g
t9300: d
o
cument fast-import emp
t
y path issues
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John
K
e
e
ping
submodule:
drop the t
o
p-le
v
el requirement
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keepin
g
r
ev-parse: add --prefix optio
n
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n
Keeping
subm
o
dul
e
: s
h
ow full path in error message
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
t7403: ad
d
missing && c
h
aining
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn K
e
eping
t7403: modernize s
t
yle
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keeping
t7401: make
i
nden
t
at
i
on consisten
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
merg
e
t
o
o
l-
-
lib: refacto
r
{diff,merge}_cmd lo
g
ic
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n Ke
e
pi
n
g
Document
a
tion/Make
f
il
e
: move infodir to be wit
h
other
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Documentation/M
a
kefile:
f
i
x
s
paces around assignments
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-12
John K
e
eping
add
-
-i
n
tera
c
t
i
ve: respect diff
.
algorithm
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-07
John Keeping
git-g
u
i: fix fi
l
e name ha
n
d
ling with
n
on-e
m
pt
y
p
r
efi
x
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-28
John
Keeping
fetch:
don't try to update unfetched trac
k
i
ng refs
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-17
John
K
eeping
difftool:
fix dir-di
f
f wh
e
n fi
l
e
does
not exist in
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-07
Joh
n
Kee
p
ing
merge-tr
e
e: hand
l
e directo
r
y/empty
c
onflict
c
orrectl
y
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-06
John K
e
epin
g
t
/
M
a
ke
f
i
l
e: don't d
e
fi
n
e TEST_RESULTS_DI
R
ECTORY
recur
s
ively
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
co
n
trib/s
u
b
t
ree: do
n
't de
l
ete remot
e
branches
i
f
spl
i
t
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-29
John K
e
epi
n
g
t
e
st o
u
tput: respect $T
E
ST_OU
T
P
U
T_DIRECTOR
Y
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn
K
eeping
t/Make
f
il
e
:
remove smoke test tar
g
e
ts
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
John
Keepin
g
merge-tr
e
e: fix
t
ypo in "bo
t
h chan
g
ed identica
l
ly"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-27
Jo
h
n Keeping
t/Makefile: fix
r
esult handling with
T
EST
_
OUT
P
UT_DIRECTOR
Y
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transport-hel
p
er:
a
d
d 'signed-
t
ags' capabili
t
y
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
ing
transport-help
e
r: p
a
ss --signed
-
tags=warn-str
i
p to
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fas
t
-
e
xport: ad
d
--signed
-
tags=
w
arn-strip mode
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn
K
ee
p
i
n
g
t/test-lib
.
s
h: fix
T
RASH_D
I
RECTORY ha
n
dling
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-08
John K
e
eping
m
e
rg
e
-tree
:
don't print entri
e
s that matc
h
"l
o
cal"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-07
John Kee
p
ing
gitr
e
mote-he
l
pe
r
s(1): cl
a
rify refsp
e
c b
e
haviour
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
submod
u
l
e
:
p
r
in
t
graph
o
u
t
pu
t
next to submodule
log
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John Keepin
g
d
i
ff: allow un
s
tuck
arguments with --diff-algorithm
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John
Keeping
git-merge(1)
:
docume
n
t diff-algorit
h
m
o
ption to
merge
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisect: avoid si
g
ned integer overflow
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
Jo
h
n Keepi
n
g
diffc
o
re-break:
d
o
n
't divide
b
y zero
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t780
0
: run --dir-di
f
f tests w
i
th and without
symlinks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keepi
n
g
t
7800: fix tests when difftool uses --no-sym
l
i
nks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keep
i
ng
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 Kee
p
ing
diffto
o
l
: don
'
t overwrite modified fi
l
es
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: move
'--symlinks' speci
f
ic test to the end
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-27
John Keepin
g
m
erge-
t
ree: fix typo in
m
erge-
t
ree
.
c::u
n
resolved
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
r
e
f
s
.
c:
fix fre
a
d
e
rror handling
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Keepi
n
g
ent
r
y: fix fil
t
er
l
ookup
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
t
2003: mo
d
ernize style
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keep
i
ng
dif
f
tool --dir-diff
:
symlink
a
ll files
matching the
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
difftool
:
avoi
d
double
slashes
i
n symlink ta
r
gets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-diff
t
oo
l
(1): fix formatting of --sym
l
ink description
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Rever
t
"
gra
p
h
.
c:
m
ark private file-sc
o
pe
s
ymbo
l
s a
s
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Makefile: make mandir,
h
tml
d
ir a
n
d infodir absolute
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John
K
ee
p
ing
rebase -i: r
e
spe
c
t core
.
commentchar
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
c
ombine-diff
.
c: teach combined
d
iff
s
about lin
e
prefi
x
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c:
u
se diff_line
_
p
refix() where
applicabl
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
d
i
f
f: add diff_line_p
r
efi
x
function
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keep
i
n
g
diff
.
c: m
a
ke constant string argum
e
nts
const
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
diff: write
p
re
f
ix to
t
he c
o
rrect fi
l
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-07
J
o
hn Ke
e
p
ing
gr
a
p
h
: output padding for
me
r
ge sub
s
eq
u
ent parents
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-05
John K
e
epi
n
g
t4038: add tests
f
o
r
"d
i
ff --cc --raw <trees>"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin/apply: tighte
n
(dis)sim
i
larit
y
index parsing
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John Kee
p
ing
merg
e
tool--lib: l
i
s
t
u
ser configured tool
s
in
'--
t
ool
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Rename {git
-
=> git}remo
t
e-he
l
pers
.
txt
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-30
John
Kee
p
i
n
g
Codin
g
Guidelines:
a
dd Python
c
oding gu
i
delines
commit
|
commitdiff
|
tree
2013-01-28
John
K
eepi
n
g
gi
t
-remote-testpy: fix p
a
th hashi
n
g on Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-28
J
o
hn
Keeping
mergetool--li
b
: 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-difft
o
ol: use git-mergetool--
l
i
b for
"--t
o
ol-help"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergetool: don'
t
hard
c
ode 'merg
e
too
l
' in show_t
o
ol_help
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git
-
m
e
r
g
etoo
l
:
remove redundan
t
assign
m
ent
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-me
r
get
o
o
l
:
m
ove show
_
t
ool_hel
p
to mergetool-
-
lib
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git-remote-
t
e
s
tpy: call
print as a
f
unc
t
io
n
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git-remote-testpy: don
'
t do unbuffered text I/O
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-r
e
mote-testpy: hash by
t
e
s
ex
p
lic
i
tly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keepin
g
svn
-
f
e: allow svnrdump_sim
.
p
y
to
r
un with Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git
_
remote
_
helpers: u
s
e 2to3
if building
w
ith Py
t
ho
n
3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Ke
e
ping
git_re
m
ote_
h
elpers: f
o
rce
r
ebuild i
f
python ver
s
ion
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-24
John Keepi
n
g
git-
c
vsimport
.
txt
:
cv
s
ps-
2
i
s deprecat
e
d
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-22
John
Keeping
gi
t
-for-each
-
ref
.
txt: 'raw' is a supported date for
m
at
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-21
Jo
h
n Keeping
git_
r
emote_h
e
lpers: fix
input when ru
n
n
i
ng und
e
r
Pytho
n
3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-21
J
ohn
Keeping
git
_
remo
t
e_helpe
r
s: allow building wi
t
h Pytho
n
3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-17
John Keeping
gi
t
-svn: teach fin
d
-rev
t
o find nea
r
m
atc
h
e
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
Jo
h
n
K
e
eping
g
i
t-fast-
i
m
p
ort(1): reo
r
ganis
e
op
t
ion
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
gi
t
-f
a
st-
i
m
p
o
r
t(1): combine docum
e
ntation of --[no
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
J
ohn
Keeping
gi
t
-shortlog(1)
:
d
o
cument behaviour of
zero-width wra
p
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-08
J
o
hn Kee
p
i
ng
g
i
t-fast-import(1): remov
e
duplicate
'--done' option
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2012-12-17
John Keepin
g
D
o
cumentat
i
on: do
n
't l
i
nk to example mail addresses
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2012-04-09
John Keeping
reba
s
e -i
contin
u
e: don'
t
s
kip commits that only change
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree