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: use reflog to find common base with upstream
2013-12-10
J
o
hn Keeping
rebase:
use r
e
f
log to find
c
ommon base wit
h
u
p
st
r
eam
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-12-09
John Keep
i
n
g
pu
l
l: use merge-b
a
s
e
-
-
for
k
-point wh
e
n appropriate
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
Docum
e
ntati
o
n/Makefile
:
mak
e
AsciiDoc dblatex dir
c
onfigurab
l
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-26
J
ohn Keeping
m
erge-recursive: fix parsing of "d
i
ff-
a
lgorithm" opt
i
on
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
res
e
t: handle submodule w
i
th trailing slash
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-13
John Keep
i
n
g
r
m
:
re-
u
s
e
parse
_
p
athspec's trailing-s
l
ash r
e
moval
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-09
John
Keeping
gi
t
_remote_helpe
r
s
: remo
v
e little used
Py
t
hon lib
r
ary
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-22
John
Keeping
r
e
v-
p
arse(1):
l
o
gi
c
ally group options
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-pa
r
se: remo
v
e restrictions
o
n some opti
o
ns
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pull: c
h
an
g
e the
d
es
c
ripti
o
n to "integra
t
e" change
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
John K
e
eping
push
:
avoid suggesting
"
mergi
n
g" r
e
mote changes
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
git-config(1):
clarify preced
e
nce
o
f
m
ultipl
e
values
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-03
John
K
eepi
n
g
git-
c
o
n
fig: update doc for --get with m
u
ltiple
v
alues
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
com
p
leti
o
n: learn
a
b
ou
t
--man-p
a
th
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-30
John Keepin
g
co
m
pl
e
tion
:
handle un
s
t
u
ck f
o
rm of
b
as
e
git options
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John K
e
e
ping
fast-import: allow movin
g
the root tree
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John Ke
e
ping
fast-import
:
allow ls or filecopy o
f
the
root tree
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John
Keeping
fast-import: set val
i
d 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 Keeping
t9
3
00: document fast-im
p
o
rt e
m
pty path iss
u
es
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John
K
e
eping
su
b
module:
d
rop the top-l
e
vel requiremen
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
in
g
rev-parse: add
-
-p
r
efix
o
p
tion
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
su
b
mod
u
l
e
: s
h
ow full path in erro
r
message
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403
:
add missing && chai
n
ing
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
t7
4
0
3
:
moder
n
ize style
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7401: m
a
k
e
indentation con
s
is
t
ent
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
me
r
getoo
l
-
-
lib: re
f
ac
t
or {diff,merge}_cmd logi
c
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Docu
m
ent
a
ti
o
n/M
a
kefil
e
:
move infodir to
be with other
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keeping
Documen
t
ation/
M
akefile: fix spac
e
s
a
round
assignmen
t
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-12
John K
e
e
pi
n
g
add--inter
a
ctive:
respect diff
.
alg
o
r
ithm
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-07
John Keeping
git-gui: fix
f
ile
name handling wi
t
h non-empty prefix
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-28
Joh
n
K
e
epi
n
g
f
e
tch: don't try to upd
a
te unfetched tracking refs
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-17
John
Keeping
difftool: fix
dir
-
d
i
ff
when f
i
l
e
doe
s
not exist
i
n
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-07
Jo
h
n Keeping
merge-t
r
ee:
h
andle direc
t
ory/empty
conf
l
ict corre
c
tly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-06
John
Keeping
t/M
a
k
e
file: don't define TEST
_
RE
S
UL
T
S_DIRE
C
TORY recursi
v
ely
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-01
Jo
h
n Keeping
cont
r
ib/
s
u
btree: don't d
e
lete remote branches if split
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-29
J
o
hn Keeping
test
o
utput: resp
e
ct $TEST_OU
T
PU
T
_DIRE
C
T
ORY
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/M
a
kefile:
remove smok
e
test targe
t
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merge-tree: fi
x
typo in "both changed
i
d
e
n
tically"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-27
John Keepin
g
t/Mak
e
file: fix r
e
sult handling wit
h
TEST_OUTP
U
T_DIRECTOR
Y
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn
K
e
eping
transp
o
rt-he
l
p
er:
add 'signed-t
a
gs
'
cap
a
bil
i
t
y
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
ep
i
n
g
transport-helper: pass --signed-tags=warn
-
strip to
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-e
x
p
o
r
t
: a
d
d --sign
e
d
-tags
=
warn-s
t
rip mo
d
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n Keepin
g
t
/t
e
st-li
b
.
sh: fix TRA
S
H_DIRECTORY
handling
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-08
John Keepin
g
merge-tre
e
: don't
p
r
i
nt entries th
a
t match
"lo
c
al"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-07
Jo
h
n Keep
i
ng
gitr
e
mote-helpers(1): clarify ref
s
pec behaviour
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
submodule: print graph outpu
t
next to
submodule log
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
J
o
h
n Kee
p
ing
diff: allo
w
u
n
stuck argumen
t
s
w
ith
-
-diff-algorithm
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eepin
g
gi
t
-
m
erge(1): documen
t
diff-algorithm
option to merge
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
J
ohn
Keeping
bi
s
ect
:
a
void signed
i
nteger overflow
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
John Keepin
g
diffcor
e
-break: don't divide by zero
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
t7800: run --dir-diff tests with and without
symlinks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: f
i
x
t
ests when diff
t
ool use
s
-
-
no-sy
m
links
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keepin
g
t78
0
0: don't hi
d
e grep
o
utput
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
d
i
fftool: don'
t
overwrite
modified files
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7
8
00:
m
ove '--symlinks
'
spe
c
if
i
c test to t
h
e end
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-27
J
o
hn
K
e
epin
g
merge-tree: fix typo in me
r
ge-tree
.
c::u
n
resolved
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-24
Jo
h
n
Keeping
r
e
fs
.
c: f
i
x fread error
h
andl
i
ng
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
ent
r
y: fix filter loo
k
up
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Keeping
t
20
0
3: modernize
style
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
difftool
--dir-diff: symlink all
f
iles m
a
t
ching the
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n
K
eeping
difftoo
l
: avoi
d
doub
l
e s
l
ashes in symli
n
k targ
e
ts
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn K
e
e
p
in
g
g
i
t
-dif
f
t
ool(1
)
: fix formatti
n
g of --s
y
mli
n
k description
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-04
J
ohn Keep
i
ng
R
ever
t
"gr
a
ph
.
c: mark
p
rivate
f
i
le-scope
s
ymbols as
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-25
John
Keeping
Makefile: m
a
ke m
a
ndi
r
, htmldir an
d
infodir absolute
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
r
ebase -i: respect core
.
co
m
mentchar
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
c
o
mbine-diff
.
c: t
e
ach combine
d
di
f
fs about line pr
e
fix
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
dif
f
.
c: use diff_line_pre
f
ix() where
a
pplicable
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: add dif
f
_line_prefix f
u
nction
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
d
i
ff
.
c: mak
e
constant string arguments c
o
ns
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
:
w
r
i
t
e prefix to the co
r
rect file
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-07
J
ohn Keepi
n
g
graph:
output
p
addin
g
for merge subsequent
pare
n
t
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-05
John Ke
e
ping
t403
8
: add
t
ests
for "diff --cc --
r
aw <trees>"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
J
o
hn Keepin
g
builti
n
/apply: tig
h
ten (dis)simi
l
arity index parsing
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John Keepi
n
g
m
erge
t
ool--lib: list
user co
n
figured tools in '--tool
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-01
John
Keeping
Rename {git- => git}re
m
ote-help
e
rs
.
txt
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-30
J
o
h
n
Keepi
n
g
Codi
n
gGuideline
s
: add Python coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
J
ohn Keepin
g
git-remote-testpy:
f
ix
p
ath hashing o
n
Python
3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
mergetool--lib: don't
c
a
ll
"exit" in
setup
_
too
l
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git-difftool: use git-merg
e
tool--lib f
o
r
"--tool-help"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-merg
e
t
ool: d
o
n't hardcod
e
'
mergetool
'
in
show_tool_help
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
e
p
ing
git-mergetool
:
r
e
m
o
ve r
e
dunda
n
t ass
i
g
n
m
ent
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Kee
p
ing
git-merget
o
o
l
:
m
ove show_tool_help to
m
ergetool--lib
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-
r
e
m
ote
-
te
s
tp
y
:
c
all pr
i
n
t
a
s a f
u
nctio
n
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git
-
r
e
m
o
t
e
-t
e
st
p
y:
don't do unbuffere
d
t
e
xt I
/
O
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn
K
eep
i
ng
git-remote-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
-f
e
: allow svnrdum
p
_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_r
e
m
ote_helpers: use 2to3 i
f
b
u
i
l
din
g
with Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git_remote_helpers: force rebuild
i
f
p
ython version
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-24
John K
e
eping
g
it-
c
vsi
m
port
.
txt: cvsps-
2
is
d
eprecated
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-22
John Keeping
git-for-each
-
ref
.
txt: 'raw' is
a support
e
d dat
e
form
a
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-21
John Ke
e
p
i
ng
git_remote_helpers
:
f
i
x input when runn
i
ng under Pytho
n
3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_remote_helpers: allow building with Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-17
John Keeping
git-svn:
teach find-rev to fi
n
d near
m
atches
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
g
it-fast-import(1)
:
reorganis
e
options
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
J
ohn Keeping
g
i
t-
f
ast-impo
r
t
(1): c
o
mbin
e
doc
u
mentation of
-
-[no
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
J
o
h
n Kee
p
ing
git-shortl
o
g(1): document behaviour of zer
o
-width w
r
ap
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-08
Jo
h
n Keeping
git-fast-impor
t
(1): remove duplicate '--done'
o
ption
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2012-12-17
John K
e
eping
Documenta
t
io
n
:
d
on't link to exampl
e
mail addresses
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2012-04-09
Joh
n
Keeping
rebase -i continue: don't skip commits that only change
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree