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
eep
i
ng
reba
s
e: fix fo
r
k-po
i
nt with zero argument
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
rebase: use
re
f
log
t
o find
c
omm
o
n base with
u
pstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keeping
pu
l
l: u
s
e merge-base --fork-point
w
he
n
a
p
propri
a
te
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
J
o
hn Keeping
Document
a
t
i
on/Makefile: make Asci
i
Doc dblatex dir c
o
nfigurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John
Ke
e
p
i
ng
merge-recursive: fix parsing of "d
i
ff-algo
r
it
h
m" optio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John K
e
eping
re
s
et:
handle submodule
w
i
t
h trail
i
ng slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
ohn Kee
p
i
ng
r
m: r
e
-use par
s
e_pathspec'
s
trailing-
s
lash removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Ke
e
pin
g
g
i
t
_remote_h
e
lpers: re
m
ove
l
itt
l
e used
P
y
t
h
on libr
a
ry
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
ohn Keeping
rev-par
s
e(1): logi
c
ally grou
p
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
Jo
h
n
Keeping
r
ev-par
s
e
: remov
e
r
est
r
ictions on
s
ome options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keep
i
ng
pull: chan
g
e the desc
r
iption
t
o
"integrat
e
" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Ke
e
ping
pus
h
: avoi
d
s
u
g
gest
i
ng
"merging
"
re
m
ote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
g
i
t-config(1): clarify prec
e
de
n
ce o
f
multiple val
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
J
ohn
K
eeping
gi
t
-co
n
fi
g
: u
p
date
doc for --get
wit
h
multiple
v
alues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
ohn Keeping
complet
i
on:
l
e
arn abou
t
--man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John
K
e
eping
c
omp
l
etion: han
d
le unstu
c
k
form of
b
ase git
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
h
n
Keepin
g
fa
s
t-import: allow moving the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n K
e
epin
g
fast-import: allow
l
s or
fi
l
ecopy of t
h
e root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keepi
n
g
fast-import: s
e
t valid mode on root tr
e
e in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Kee
p
ing
t9300: docu
m
ent
f
a
s
t
-impo
r
t
e
m
p
ty path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
ng
submodule
:
drop t
h
e top-lev
e
l requi
r
ement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
rev-parse: add --p
r
efix
optio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
s
u
bmodule
:
show f
u
ll path in error message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
t7403: add
mis
s
i
ng && ch
a
ining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
t
7403
:
modern
i
z
e style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n Keeping
t7401: make i
n
dentation c
o
nsi
s
tent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
me
r
getool--li
b
:
refactor {di
f
f,merge}_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keeping
Documentation/Makefile: move infodir
t
o
be
with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
e
ep
i
ng
Docu
m
en
t
ation/Makefile: fix spaces around assi
g
n
m
ent
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
add--interacti
v
e: respect diff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Ke
e
ping
git-gui
:
fix file
nam
e
ha
n
dling with non-empty p
r
efix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
fetch: don't tr
y
t
o
updat
e
unfet
c
hed trac
k
ing refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
J
o
hn
Keeping
diffto
o
l:
fix d
i
r
-
diff when
fi
l
e
d
o
e
s
n
ot exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-tree: handle
directo
r
y/empty conflict co
r
rectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t
/
M
akefile:
don't define TE
S
T_RESUL
T
S_DIREC
T
ORY r
e
cursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
J
o
hn
K
e
e
ping
contrib/subtree: don'
t
d
e
lete
r
emote branches
if sp
l
it
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John
Keeping
te
s
t
output: respect $TEST_OUT
P
UT
_
DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefile: remo
v
e s
m
oke test target
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn Kee
p
in
g
merge-tree: fix typo in
"both chan
g
ed identicall
y
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
J
ohn Keeping
t/
M
ake
f
ile: fix res
u
l
t handling with TEST_OUTPUT_DIRECT
O
RY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
p
ing
transp
o
r
t
-
h
elpe
r
: add 'sig
n
ed-tag
s
' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
Keeping
transpor
t
-he
l
p
e
r: pas
s
--sig
n
ed-t
a
gs=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keeping
fast-export: add --signed-t
a
gs=w
a
rn-stri
p
m
o
d
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n
K
eepi
n
g
t/
t
est
-
lib
.
sh:
f
i
x TRASH
_
D
IRECT
O
RY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keepin
g
merge-tree: d
o
n't
p
ri
n
t
entries tha
t
match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
J
ohn Keeping
gitr
e
mote-helpers(1): clarif
y
r
e
fspec behav
i
o
u
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Ke
e
ping
s
ubmod
u
le:
p
ri
n
t gra
p
h output next
t
o
sub
m
odule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
dif
f
:
a
llow unstuck arguments with
-
-dif
f
-algori
t
hm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
git-merg
e
(1): document
d
iff-algorithm opti
o
n to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
h
n Keeping
b
isect: avoi
d
s
i
gne
d
integer
overf
l
ow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John K
e
eping
diffc
o
r
e
-break: don't divide
by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keep
i
ng
t7
8
00: run
--d
i
r-diff te
s
ts wi
t
h and
w
ith
o
ut symlink
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t7800: f
i
x tests wh
e
n difftool uses
-
-no-sy
m
links
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: don't
h
ide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
p
i
ng
di
f
f
t
ool:
d
o
n'
t
o
verwrite
m
odified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keeping
t780
0
: move '--symlinks' s
p
ec
i
fic tes
t
to th
e
end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
m
e
rg
e
-
t
ree: f
i
x typo in
m
erge-t
r
ee
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
J
o
hn Keeping
ref
s
.
c: fix
fr
e
ad err
o
r
handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
entry:
fix
fi
l
ter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn
K
ee
p
ing
t2003:
m
oderni
z
e
st
y
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Keep
i
ng
difftool --dir-
d
iff: symlink all files matc
h
ing the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
dif
f
tool: avoi
d
double
slashes in s
y
m
l
i
nk targe
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
ee
p
ing
g
it-diffto
o
l(1): fix
formatt
i
ng of -
-
symlink d
e
scription
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Revert "gra
p
h
.
c: mark
private fil
e
-scope symbol
s
a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Ke
e
pin
g
Ma
k
e
fil
e
: make mandir,
h
tmldir a
n
d infodir a
b
solute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebase -i: res
p
ec
t
core
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
combin
e
-diff
.
c
:
teach combine
d
d
i
ffs about
l
ine prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n
Keeping
di
f
f
.
c
:
use diff_line_p
r
efix()
w
h
e
re appli
c
able
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
d
i
ff: a
d
d di
f
f_line_pref
i
x
functi
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
d
i
ff
.
c:
make cons
t
ant
s
tring
a
r
g
ume
n
ts const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
di
f
f
:
wri
t
e
pr
e
fix
t
o the correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keepi
n
g
graph: output pa
d
ding for me
r
ge subsequent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
ohn
Keep
i
ng
t4038
:
add tes
t
s
for "diff --c
c
--raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
buil
t
in
/
apply: tighten (dis)similari
t
y index pa
r
sin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
K
ee
p
ing
m
ergetool--lib: li
s
t
user configured tools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
Jo
h
n Keep
i
ng
Rename {git- => git}remote
-
helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
o
hn
K
eeping
Cod
i
ngGuid
e
lines: add Python
c
oding g
u
idelines
commit
|
commitdiff
|
tree
2013-01-28
J
o
hn K
e
e
ping
git-rem
o
te-t
e
stpy: fix path
has
h
ing
on P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
Jo
h
n
Keeping
mergetool--lib: do
n
't call "exit"
i
n setup
_
tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n
Keeping
git-d
i
fftool:
us
e
g
i
t-mergetool--lib for "--too
l
-he
l
p"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n
K
e
eping
git-merget
o
ol: d
o
n't hardcode '
m
ergetool' in show_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
p
i
ng
g
it-mergetool: remove redund
a
nt assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keep
i
ng
git
-
mergetool: mov
e
show_to
o
l_
h
elp to m
e
rgetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-rem
o
te
-
t
es
t
py: call pr
i
nt as a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote-testpy: d
o
n't do unbuffered text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remo
t
e-test
p
y: hash bytes expl
i
citly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
sv
n
-fe: allow
svnrdump
_
sim
.
py to run with Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git
_
remote_helpe
r
s: us
e
2to3 if building with Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Kee
p
ing
gi
t
_r
e
m
o
t
e_
h
elpers: force r
e
buil
d
if pyt
h
on v
e
rsion
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John K
e
eping
git-cvsimport
.
txt: cvsps
-
2 is de
p
recated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
J
o
hn
Keep
i
ng
git-
f
or-e
a
ch-ref
.
txt:
'
raw' i
s
a
supported date
f
ormat
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_re
m
ote_h
e
lpers: fix input
w
hen running under Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John K
e
eping
gi
t
_remo
t
e_help
e
rs: allo
w
buil
d
ing with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keeping
git-svn: teach
f
ind
-
rev to
f
ind n
e
a
r matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-
f
ast-import(1): re
o
rganise options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keepin
g
git-fast-im
p
ort(1): com
b
i
ne
documen
t
ation of --[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
gi
t
-shor
t
l
og(1): d
o
cument beha
v
iour of zero
-
widt
h
wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
Jo
h
n Keeping
git-fast-import(1): remove d
u
plic
a
te '--done
'
option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John Keeping
Docu
m
entation:
d
on't link to examp
l
e
mail
addresses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John
K
e
eping
rebase -i cont
i
n
u
e:
d
o
n
'
t skip c
o
mmits that on
l
y change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree