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
pull: suppress error when no remoteref is found
2014-01-17
Joh
n
Keeping
p
u
l
l
:
s
uppress error
when
no remoter
e
f is fou
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John
K
eeping
re
b
ase:
f
i
x for
k
-poin
t
with z
e
ro
a
r
g
uments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Ke
e
p
i
n
g
reba
s
e: use reflog
to find common base with
u
pst
r
eam
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
Jo
h
n
Keeping
pull: use me
r
ge-bas
e
-
-
f
ork
-
point when appropr
i
ate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
J
ohn
K
eepi
n
g
Docum
e
n
ta
t
ion/Makefile: make AsciiDoc dblatex dir co
n
figurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
J
o
h
n
Keepi
n
g
merge-
r
ecursive: fix parsing of
"diff-algorithm" opti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keep
i
ng
r
ese
t
: handle su
b
m
odule wit
h
t
r
ailin
g
slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
o
hn Keeping
rm: re
-
use parse_pathspec's
tra
i
li
n
g-slash removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
J
ohn
Keep
i
ng
git_rem
o
te_help
e
rs:
r
emove little used
Py
t
hon library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John K
e
eping
rev-parse(1)
:
logically group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John
K
e
eping
rev-parse: remove restrictions on some options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John K
e
eping
pu
l
l
:
change the description to "integrate"
change
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
o
hn Kee
p
ing
p
us
h
:
avo
i
d suggesting "merging" remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
o
hn Keeping
g
it-c
o
nfig
(
1): clarify pr
e
cedence of multiple valu
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
Jo
h
n
Keeping
g
i
t-config: upda
t
e d
o
c
for -
-
get with
multipl
e
values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keepin
g
complet
i
on: learn about --man-pat
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
completion: handle u
n
stu
c
k
fo
r
m of base
g
it
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John K
e
eping
fast-import: allow moving the
r
o
o
t tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n
K
e
epin
g
fast-
i
mp
o
r
t: allow
l
s or filecopy of the
root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
f
ast-i
m
port: se
t
v
alid
m
ode
on
root tre
e
i
n
"
ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t9300: document fast-import
empty path iss
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submod
u
le:
d
rop the top-le
v
el
r
equirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
re
v
-
p
a
r
s
e
: add --prefix opt
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
s
ubmodul
e
: show full path i
n
error message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t740
3
:
add missin
g
&
&
ch
a
ining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
t7
4
03:
m
oderniz
e
s
tyle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keepi
n
g
t74
0
1: make
indentation
c
onsistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
K
e
eping
mergetool--lib: refactor {diff,merge}_cmd
logi
c
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
p
ing
Documentation/Makefi
l
e: move infodir to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Doc
u
mentation/Ma
k
efile: fi
x
spaces around assi
g
nments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
J
o
hn Keeping
add--interactive: r
e
sp
e
ct diff
.
algor
i
thm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John K
e
epi
n
g
gi
t
-gui: fix file na
m
e handl
i
ng wit
h
non-empty prefi
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
J
o
hn Keeping
f
e
t
ch:
d
o
n't try
to
update unfe
t
ched tra
c
king
r
efs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John K
e
eping
difftool:
f
ix d
i
r
-
diff
wh
e
n file does not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merg
e
-tree:
h
a
ndle directo
r
y
/
empty conf
l
i
c
t correc
t
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John
K
eeping
t/Makef
i
le: don't define TEST
_
RE
S
ULTS_DIRECTORY r
e
c
u
rsively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
J
o
h
n
Ke
e
ping
contrib/su
b
tree: don't delete remote br
a
n
ches if spli
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John
Ke
e
ping
tes
t
output: respect $TEST_OUTPUT_DIRECTOR
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefile: remove smoke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Joh
n
Keeping
merge-tree: fix
t
ypo in "b
o
th
change
d
ident
i
cally
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t/Makefile: fi
x
resu
l
t ha
n
dl
i
ng with TEST_OUTPUT_DIREC
T
ORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Keeping
t
ransport-helper: add
'
signed-tag
s
'
capabil
i
ty
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
Keeping
transpor
t
-
helper: pass --s
i
g
n
ed
-
ta
g
s=
w
arn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fas
t
-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/t
e
st-lib
.
sh
:
fi
x
TR
A
SH_DIRECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-tree: don't
print entries that match "loca
l
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Kee
p
ing
gitremote
-
he
l
pers(
1
): clar
i
fy refspe
c
behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
su
b
module: print graph output next to su
b
m
odule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn Keeping
diff
:
allo
w
u
n
s
t
uck argumen
t
s
w
ith -
-
diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Kee
p
ing
git-
m
erge(1): do
c
ume
n
t di
f
f-algori
t
hm option to
m
erge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Ke
e
ping
b
i
sect
:
avoid
s
i
gned
integ
e
r
ov
e
rfl
o
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn Keeping
diff
c
ore-b
r
eak: don'
t
divi
d
e by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
e
e
ping
t7800: run --dir-diff tes
t
s with and without symlin
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
t7800: fi
x
tes
t
s when difftool
uses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
t7800: don't hide grep ou
t
put
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
h
n
Keeping
difftool: d
o
n
't
overwrite modi
f
ied fil
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
t7800
:
move '--symlinks'
s
pecific test
t
o the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
Joh
n
Ke
e
p
i
ng
m
e
r
ge-tree: fix typo in me
r
ge-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John K
e
eping
r
e
fs
.
c: fi
x
fread erro
r
handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Kee
p
ing
entr
y
: fix filt
e
r l
o
ok
u
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2003
:
mod
e
rnize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn K
e
eping
diff
t
ool --dir-diff: s
y
m
l
ink al
l
files m
a
t
c
hing
the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
h
n
Kee
p
ing
difftool: a
v
oid d
o
uble slash
e
s
i
n
sy
m
link targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
git
-
di
f
ftool
(
1
): fix
f
ormatting of --symlin
k
descri
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Revert
"
graph
.
c:
mark private file
-
scope sy
m
bols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
Jo
h
n
Keeping
Makefile: make
m
andi
r
, htm
l
dir and in
f
odir absolut
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
reb
a
s
e
-i: respect c
o
re
.
c
ommentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
pi
n
g
combine-diff
.
c
: teach combined diffs ab
o
u
t
l
i
ne pr
e
fix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
iff
.
c
:
use diff_
l
i
n
e_
p
refix
(
)
w
here
applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: a
d
d
dif
f
_line_prefix
function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n Keep
i
ng
diff
.
c: make constant str
i
ng arguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
di
f
f: write pr
e
fix
t
o the correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
graph: output padding for me
r
ge su
b
sequent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
o
hn Keeping
t4038: add te
s
ts for "di
f
f
-
-cc --
r
aw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
K
e
e
p
ing
bu
i
ltin
/
apply: tighten (dis)similarity inde
x
p
arsi
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Ke
e
p
i
ng
mergetool--lib: list us
e
r c
o
nfigured tools in '-
-
to
o
l
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
o
h
n Kee
p
ing
Rename {git- => g
i
t}remo
t
e-helpe
r
s
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
Joh
n
Keeping
C
od
i
ngGuidelin
e
s: add Python coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-remote-
t
estpy: fix path has
h
i
ng on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keepin
g
mergetool-
-
l
ib: d
o
n'
t
call
"exit" in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
g
i
t-d
i
fftool: use git-mergetool--lib for "
-
-
t
ool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
pin
g
g
it-mergetool: don
'
t hardcode 'merget
o
ol' in sh
o
w
_
t
ool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n Keeping
git-mergetool:
r
e
move redund
a
n
t assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
ee
p
i
n
g
git-merge
t
ool: m
o
ve sho
w
_to
o
l_help to
merget
o
ol--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Kee
p
ing
g
i
t-remote-te
s
tpy: ca
l
l pr
i
nt
a
s
a fu
n
ction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
g
i
t-remote-testpy: don't do unbuffe
r
e
d
text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
g
i
t
-remote-testpy: hash by
t
es explici
t
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
n
g
svn-fe: a
l
low svnrd
u
mp_sim
.
p
y to
run
w
ith
P
ython 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_rem
o
te_help
e
r
s
:
use 2to3 if b
u
ilding w
i
th Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
e
p
ing
git_
r
e
mote_help
e
rs: fo
r
ce rebuild
i
f
p
ython version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keepi
n
g
g
i
t-cvsimport
.
txt: cvsps-2 is deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keeping
git-f
o
r-each-ref
.
txt: 'raw' is a
su
p
ported
date for
m
at
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_remote_helpers:
fix inp
u
t
w
he
n
runni
n
g under Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
Jo
h
n Keeping
g
i
t
_remote
_
helpers: allow building with Py
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keeping
git-svn: teach find-rev to
find ne
a
r matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Ke
e
ping
git-fast-im
p
ort(1): reorga
n
ise options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
Jo
h
n
K
eeping
git-fast-import(1): combine documenta
t
ion of --[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John
Keeping
git-shortlo
g
(1): docume
n
t be
h
av
i
our of zero-width wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
Jo
h
n
Kee
p
in
g
git-fast-impo
r
t(1):
remove duplica
t
e '--d
o
n
e
' optio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
J
ohn Keepi
n
g
Doc
u
me
n
t
ation:
d
o
n't
link t
o
exam
p
le m
a
il add
r
esses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next