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
completion: add missing options for git-merge
2014-05-27
John Ke
e
ping
completion: add
m
issing
o
ptions for git-merge
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-05-27
Jo
h
n Keeping
completion: add a note that m
e
r
g
e options are shared
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-03-11
John Keeping
builti
n
/mv: fix out of
bounds wri
t
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
Joh
n
Keeping
builtin/mv: don't
use memory after free
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
Joh
n
Keeping
u
tf
8
: use correct type for v
a
lues in interv
a
l ta
b
le
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
John Ke
e
ping
utf8: fix ic
o
n
v
error
d
etec
t
ion
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
Jo
h
n Keeping
notes-utils: handle bo
o
lean no
t
es
.
r
e
write
m
ode correctly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-27
John
Keeping
Makefil
e
:
remove redundant object in git-http{
f
e
tch
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-17
John
K
eeping
pull: suppress e
r
ro
r
when
no re
m
oteref is
f
ound
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-13
Jo
h
n
Keeping
com
p
letion
:
handle --[n
o
-
]
fork-poi
n
t options to git
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
completio
n
:
c
o
mplet
e
m
erge-base
op
t
ions
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-09
John Kee
p
ing
r
eb
a
se:
f
ix fork-point with zero arguments
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-12-10
J
o
hn Kee
p
ing
r
ebase:
u
s
e
re
f
log to
f
ind common
base
w
ith up
s
trea
m
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-12-09
John
K
eeping
pull
:
use me
r
g
e-base
-
-
for
k
-
point whe
n
appropria
t
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
p
e
e
k
-remote: r
e
mo
v
e deprec
a
ted ali
a
s
of ls-rem
o
t
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John Ke
e
pin
g
lo
s
t-found: remove deprecated c
o
mmand
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John
Keeping
tar-tr
e
e
: remove deprecated command
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn
Keeping
r
e
po-config: remove d
e
precated alias for "git config"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
Documentat
i
on
/
Makefile: make Asc
i
i
Doc dblatex dir
c
onfigu
r
able
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
merge
-
recursiv
e
: fix parsing of "diff
-
a
lgo
r
i
thm
"
option
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-13
John Keepi
n
g
reset: hand
l
e submodule with trailing slash
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-13
J
o
hn Keep
i
n
g
rm: re-use pa
r
s
e
_pathspec's trailin
g
-sla
s
h
r
emoval
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-09
John Keeping
g
i
t_remote_helpers: remove little used Pytho
n
li
b
rary
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-parse(1): logic
a
lly
g
r
o
up o
p
t
ions
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-parse:
r
emove restrictions on s
o
me options
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-08
John Kee
p
in
g
pul
l
: change t
h
e desc
r
iptio
n
to "integrate" changes
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
John Keep
i
ng
push: avoid suggesting
"merging" remote changes
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
git-co
n
fig(1): clarify precedence of m
u
lt
i
ple valu
e
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-03
John
Keeping
git-co
n
fig: update doc for --get with
m
ult
i
ple values
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
comple
t
i
o
n
: lear
n
about -
-
man-path
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-30
John Ke
e
ping
complet
i
o
n
:
h
a
n
dle u
n
stuck form of base g
i
t options
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John
Ke
e
ping
fa
s
t-impor
t
:
allow mo
v
ing the ro
o
t tree
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John
K
eeping
fast-import:
a
llow
l
s
o
r
f
ilecopy of the root tre
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John Keepin
g
fast-import: set valid mode on
r
oot
tree i
n
"ls"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n Keep
i
ng
t930
0
: document
f
ast
-
i
mport
empty
path i
s
sues
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
submodu
l
e:
d
ro
p
the top-l
e
vel req
u
irement
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
epin
g
rev
-
pa
r
se: add --prefix
o
ption
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
su
b
m
o
d
ul
e
: show
full pa
t
h in error message
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
t7403
:
a
d
d missing
&
&
chainin
g
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n Keeping
t7403: mode
r
nize style
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eepi
n
g
t7401:
make indentation con
s
istent
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
me
r
getool--lib: re
f
actor {diff,merge}_cmd
l
ogic
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
Documentat
i
on/Makefile:
mov
e
inf
o
d
ir to be with oth
e
r
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
Doc
u
mentation/M
a
kefil
e
: fix sp
a
ce
s
around assig
n
ments
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
add--interactiv
e
:
resp
e
ct diff
.
algorithm
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-07
John
Keepi
n
g
git-gui: fix file na
m
e
ha
n
dling with non-em
p
t
y
p
r
efix
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
fetch: don't
try to updat
e
unfetched tracking r
e
fs
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-17
John K
e
e
ping
difftoo
l
: fix di
r
-diff when fil
e
d
oes not exis
t
i
n
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-07
John K
e
eping
me
r
ge-tree: handle di
r
ectory/
e
mpty conflict correctly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/Ma
k
efile: don't de
f
i
n
e
TEST_RESU
L
TS_
D
IR
E
CTO
R
Y recurs
i
vely
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-01
J
o
hn Keeping
co
n
tri
b
/subtree: don't delete remot
e
bran
c
hes if spli
t
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
t
est ou
t
put
:
re
s
pect $TES
T
_OUTPUT_DIRECTORY
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
John K
e
e
ping
t/Makefile:
remove smoke test targets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
John
K
e
e
p
ing
merg
e
-tree:
f
ix typ
o
in "
b
oth changed
i
dentically"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-27
John Ke
e
ping
t/Makefile: fix
r
e
sult handlin
g
with
TEST_OU
T
PUT_D
I
RECTORY
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
eping
trans
p
ort-help
e
r: add 'signed-tags'
c
apability
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Kee
p
ing
transp
o
r
t-helper: pass --signed-t
a
gs
=
war
n
-st
r
ip to
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
ing
fa
s
t-export: add --signed
-
tags=wa
r
n-
s
t
rip mode
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Ke
e
p
i
ng
t/test-lib
.
s
h
:
fix
T
RASH_DIRECT
O
RY han
d
ling
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-08
John K
e
eping
merge-tree
:
don't p
r
i
n
t
e
n
tri
e
s th
a
t
m
a
tch
"
local"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-07
John Ke
e
p
i
ng
g
itr
e
mote-helpers(1): c
l
arify refspec beh
a
vio
u
r
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn Keeping
sub
m
odule: prin
t
g
raph output
n
e
x
t to submo
d
ule lo
g
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John Kee
p
ing
diff: all
o
w
u
n
s
tuck argume
n
ts
with --di
f
f-algorithm
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn Keeping
g
i
t-mer
g
e(1): document diff-algor
i
thm opt
i
on t
o
merge
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
John
Keeping
bi
s
ect:
avoid signed integer o
v
erflo
w
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
diffcore-brea
k
: don't divide by ze
r
o
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t
7800: run
-
-
d
ir-diff tests with and w
i
t
h
o
u
t symlinks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eeping
t7
8
00: fix
t
ests wh
e
n
di
f
ftoo
l
use
s
--no-syml
i
nks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: don't hide gre
p
o
utput
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
d
i
fftool: do
n
't overw
r
ite
m
o
dified
f
iles
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: move '
-
-
s
y
m
links' specific t
e
st to the e
n
d
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-27
Jo
h
n Ke
e
p
ing
merge
-
tree:
f
ix typo in merge-tree
.
c::unresolved
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c: fix fread error
han
d
l
ing
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Keeping
entry:
fix filte
r
lookup
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2003
:
mod
e
rnize s
t
yle
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keepin
g
difftool --d
i
r-diff: symlink all files mat
c
h
i
ng the
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
ping
di
f
ftool: av
o
id do
u
b
le slashes
i
n
s
ymlin
k
tar
g
et
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
gi
t
-difftool
(
1):
f
ix
f
ormat
t
ing of
-
-syml
i
nk des
c
ription
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-04
John Keepi
n
g
Revert "graph
.
c: mark private file-scope
symbols as
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Makefile: mak
e
m
a
n
d
ir,
htmldir and infodir a
b
solute
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebase -i: respe
c
t
c
ore
.
co
m
mentch
a
r
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
combine-diff
.
c: teach
c
ombined diff
s
about line
p
refix
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
epi
n
g
diff
.
c: use diff_line_
p
refix() where applicab
l
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
diff: add diff_
l
i
n
e_prefix
f
u
nction
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
d
i
ff
.
c:
m
a
ke
c
onstant string argumen
t
s
con
s
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
pi
n
g
diff: write prefix to
the correct file
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
graph: output pa
d
ding
f
or merge subsequent parents
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-05
John
K
e
e
p
i
n
g
t40
3
8: add tests fo
r
"diff
--cc
--raw <tr
e
e
s
>"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John Keep
i
ng
builtin/app
l
y: tighte
n
(dis
)
similarity index parsing
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
J
o
hn Keeping
merge
t
o
o
l--lib: list user
c
o
n
f
i
g
ured tools i
n
'--tool
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Rename {git- => gi
t
}r
e
m
o
te-helpers
.
t
xt
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
CodingGuideli
n
es:
ad
d
Pytho
n
coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-remote-testpy
:
f
ix p
a
th hashing
on
P
yt
h
on
3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
mergetoo
l
--lib: don't cal
l
"
e
xit" in setup_tool
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git-d
i
ff
t
ool:
use gi
t
-
merget
o
ol--lib for "--tool-he
l
p"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-merg
e
tool: don't hardcode
'
mergetool' in sho
w
_
t
ool_help
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n
Kee
p
i
n
g
git-
m
ergetool:
r
emove
redundan
t
assignment
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
g
it-m
e
r
g
e
t
ool: move show_tool_help to mergetool--lib
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John
Kee
p
ing
g
i
t-remote-testpy:
c
a
l
l
print as a
f
unct
i
on
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
epin
g
git-remo
t
e-testpy:
don't
do unb
u
ff
e
red text I/O
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
next