repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'mc/doc-submodule-sync-recurse' into maint
2014-05-27
John Keeping
completion:
ad
d
mis
s
ing options for git-merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John
K
eep
i
n
g
comp
l
etion: add a
n
o
te that merge options are sha
r
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
J
o
hn Keepin
g
builtin/mv: fix out
of bounds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John
Keeping
builtin/mv: don
'
t use me
m
ory after free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
u
t
f8: use corre
c
t
type for valu
e
s i
n
interval t
a
bl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John
Kee
p
ing
u
tf8: f
i
x
i
conv err
o
r detection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
notes-utils: handle bo
o
lean not
e
s
.
rewr
i
temode correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John Keeping
Makefile: remove redundant object in git-http{fe
t
c
h
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John Keeping
pull: suppress
e
rror wh
e
n no remoter
e
f is foun
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
com
p
letion: handle -
-
[no-]fork-point options
to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keepin
g
completi
o
n:
c
omplete merge-base options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John K
e
eping
r
e
b
ase: f
i
x
fork-
p
oi
n
t wit
h
zero
a
r
guments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Kee
p
ing
reba
s
e: us
e
reflog
t
o find comm
o
n base
w
ith upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John K
e
eping
pull:
u
se merge-base
-
-fork-point when ap
p
ropriat
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn Keeping
p
e
ek-r
e
m
ote: remove depr
e
cated ali
a
s of ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John K
e
e
p
i
ng
lost-found: re
m
ove deprecat
e
d command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
K
eep
i
ng
tar-tree: remo
v
e dep
r
ecate
d
com
m
and
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Ke
e
ping
repo-
c
onfig: remove deprecated a
l
ias for "git c
o
n
fig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
Jo
h
n Ke
e
ping
Document
a
tion/Mak
e
file: make A
s
ciiD
o
c
dblatex
d
i
r con
f
igurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
merge
-
re
c
ursive: fix pars
i
ng of
"diff
-
algorit
h
m" o
p
tio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
reset: handle submodule wit
h
trailing
slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keepi
n
g
rm: re-use parse_pathspec
'
s trailing-sl
a
sh re
m
ova
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Ke
e
pi
n
g
git_r
e
mote_helpers: rem
o
ve l
i
ttle use
d
Python library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
Jo
h
n
K
eeping
rev-parse(1): logically gr
o
u
p options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Ke
e
ping
rev-parse: remo
v
e restrictions on some
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pull: chan
g
e the descrip
t
i
on to "inte
g
r
a
te" c
h
anges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
push
:
avo
i
d suggesti
n
g "merging" remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Jo
h
n Keepin
g
git-config(1
)
: clarif
y
prece
d
ence of mult
i
p
l
e values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
g
it-config: update
d
o
c for
--get with
multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John
Keeping
c
omp
l
eti
o
n: learn about --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
compl
e
tion: handle
u
nstu
c
k
form
of base
g
it o
p
ti
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-import: allo
w
moving the root t
r
ee
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
Keeping
fast-impor
t
: allow ls o
r
filecop
y
of the root
t
ree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n
Keeping
fast
-
i
m
port: set valid mod
e
on
r
oot tree in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n Keeping
t930
0
: document fast-import empty p
a
t
h
is
s
ues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
subm
o
dule: dr
o
p the top-lev
e
l requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
rev-parse: add --prefix opti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
submodul
e
: show fu
l
l path in err
o
r
m
essage
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keepin
g
t7403: ad
d
m
i
ssi
n
g && chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
K
e
eping
t74
0
3: moder
n
ize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7401: make i
n
dentat
i
on consis
t
ent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
m
ergetoo
l
--lib: refactor
{diff
,
merge}_c
m
d
l
og
i
c
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Doc
u
m
e
ntation/Makefile: move infodir to be wi
t
h other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
K
e
ep
i
ng
Docum
e
ntation/
M
a
ke
f
ile: fix
s
pace
s
ar
o
u
n
d assignm
e
n
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
J
oh
n
K
e
eping
add
-
-
in
t
era
c
tive:
respect diff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
J
o
hn Keepin
g
gi
t
-g
u
i
:
fix file
name handling
with non-empty prefi
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keepi
n
g
fetch:
d
on't t
r
y
t
o upda
t
e unfetched tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
Jo
h
n Keeping
diff
t
ool: fix dir
-
diff when file does not exi
s
t in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Kee
p
in
g
m
erg
e
-tree: hand
l
e dir
e
ctory/empty confl
i
ct corre
c
t
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t
/M
a
kefile:
don't d
e
fine TE
S
T_RES
U
L
TS_DIRECTORY recursiv
e
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John
Keep
i
ng
contrib/subtree:
d
o
n
'
t
delete remote bra
n
c
h
es
if
split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test out
p
ut: re
s
pect $TEST_OUTPUT_DIR
E
CTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefile: remove smoke te
s
t ta
r
gets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
h
n Ke
e
ping
merge-tree: fix typo in
"both ch
a
n
ged i
d
entica
l
l
y"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John K
e
eping
t/Makefile: fix result
h
and
l
ing
wi
t
h TEST_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n K
e
eping
transport
-
h
e
lper: add 'sig
n
ed
-
tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transport-helper: pass --signed-tags=w
a
r
n
-
str
i
p
t
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-e
x
port: add --sign
e
d-tags=warn-strip
mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepin
g
t
/
test-lib
.
sh: fix TRASH_DIR
E
CT
O
RY
h
andl
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
Jo
h
n Keepin
g
merge
-
tre
e
: don't print entries t
h
at
m
a
tch "l
o
cal"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitremote-helpers(1): cl
a
rify refspec be
h
aviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
submodule: print
graph
out
p
ut next to subm
o
dule
log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn
Keeping
d
iff: a
l
low u
n
stuck arguments with -
-
di
f
f-algo
r
ithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
git-merge(
1
)
:
docume
n
t
d
i
f
f-algorit
h
m option to
m
e
rge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Keeping
bisect: avo
i
d signed
integer ove
r
f
lo
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
K
eeping
diffcore-
b
re
a
k: don't divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
oh
n
Keeping
t7800:
r
un
--dir-diff
tes
t
s
with and without
s
ymlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keepin
g
t78
0
0
: fix tests whe
n
difft
o
ol use
s
--
n
o-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800
:
don't hide gre
p
out
p
ut
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eepin
g
dif
f
tool
:
d
o
n't overw
r
ite m
o
d
ified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keepi
n
g
t
7
80
0
:
move '-
-
symlinks' sp
e
cific test to the
e
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keepin
g
merge-tre
e
:
f
ix typo
i
n merge-tree
.
c::unre
s
ol
v
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John
K
e
e
ping
refs
.
c: fi
x
fread err
o
r
handlin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepin
g
e
n
try: fix filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
t
2
003:
m
o
dernize
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keepi
n
g
di
f
ftool --dir-diff: sy
m
li
n
k all files matching th
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n
K
e
eping
difftoo
l
: avoid double slas
h
es in symli
n
k targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Ke
e
ping
git-diff
t
ool(1):
fix formatting of
--symlink
d
e
scription
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keepin
g
Rever
t
"graph
.
c
:
ma
r
k
p
riv
a
te fi
l
e-scope symbols a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Make
f
i
le: m
a
ke
mandir,
htmldir and infodir abs
o
lute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebas
e
-i: respect
c
ore
.
comment
c
har
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn
K
eepi
n
g
combine-diff
.
c: teach combined diffs about line pref
i
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
d
i
ff
.
c: use dif
f
_line_pr
e
fix() where
applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff:
add
d
iff_l
i
ne_prefix func
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keepi
n
g
diff
.
c: make con
s
tant s
t
ring arguments co
n
st
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: wri
t
e
p
r
e
fix to the c
o
rrect fi
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
graph
:
output
p
addi
n
g for mer
g
e su
b
sequent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
Jo
h
n Keeping
t4038: add t
e
sts for "
d
i
ff --cc --raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
oh
n
Keeping
b
u
ilti
n
/apply: tig
h
ten (dis)sim
i
lari
t
y index parsi
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
m
er
g
etool--lib: list user configured
t
ools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John
Keeping
Renam
e
{gi
t
- => git}remo
t
e-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keepi
n
g
CodingGuideline
s
:
a
dd Python co
d
ing guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keep
i
ng
gi
t
-re
m
o
t
e-testpy: fix path has
h
ing o
n
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
Joh
n
Keepi
n
g
merget
o
ol--li
b
: don't cal
l
"exit"
i
n setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
epi
n
g
git-difft
o
ol: us
e
git-mergetoo
l
--lib for "
-
-tool
-
h
e
lp"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
it-merg
e
to
o
l: don't hardcode 'mergetool' in show_tool_he
l
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-me
r
getool: remove
r
e
d
u
ndan
t
assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t
-mergetool: mo
v
e
s
how_
t
ool_help to mergeto
o
l--l
i
b
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
gi
t
-remote-
t
estpy: call p
r
int as a fu
n
c
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-
r
em
o
te-testp
y
:
don't do unbu
f
fered text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next