repo.or.cz
/
git
/
raj.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 Keeping
completion: add missin
g
op
t
ions for git-merge
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-05-27
John
K
e
eping
completion:
a
dd a note that merg
e
optio
n
s are shared
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-03-11
Jo
h
n
K
ee
p
i
ng
bui
l
tin/mv: fi
x
out
of b
o
unds wri
t
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
J
o
hn Keeping
builtin/mv: don'
t
u
s
e
m
emory
after free
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
John K
e
e
p
ing
u
tf8: us
e
corre
c
t type for va
l
ues in interval ta
b
le
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
John
Keeping
utf8
:
f
i
x iconv error detection
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
Joh
n
Keeping
notes-utils: handle boolean not
e
s
.
rewrite
m
ode cor
r
ectl
y
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-27
John Keepin
g
Makef
i
le: rem
o
ve re
d
undant object
i
n git-http{f
e
t
c
h
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-17
John K
e
eping
pull:
suppress error when no
remoteref is found
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-13
John
K
eeping
comp
l
etio
n
: handl
e
-
-
[
n
o-]f
o
rk-p
o
in
t
options
to
g
it
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-13
John Kee
p
ing
c
om
p
letion: co
m
plete merge-
b
a
s
e
options
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-09
Joh
n
Kee
p
ing
reba
s
e: fix fork-
p
o
i
nt with zero arguments
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
reb
a
se: use reflog
t
o f
i
nd co
m
mon base wit
h
upstream
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-12-09
John Keepin
g
pull: use mer
g
e-base --for
k
-point when appropriate
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
Joh
n
Keeping
peek-
r
emote: remov
e
depr
e
cated alias of ls-remote
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
lost-fo
u
nd: remove deprecated
c
ommand
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
tar-tree: r
e
m
o
v
e deprecated command
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John K
e
eping
repo-config: rem
o
ve deprecated alias for
"
g
it config"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-10-03
J
o
h
n Keeping
Document
a
tion/Make
f
ile: make AsciiDoc
dblate
x
dir configurable
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
m
e
rge-recursive: fix parsing of "diff-algorithm" option
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-13
John
Keeping
reset: handle s
u
bmodule with trailing slash
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-13
John K
e
epi
n
g
r
m
: re-
u
se pa
r
se_pathspe
c
's tr
a
iling-sl
a
sh removal
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-09
John Keepin
g
git_remote_he
l
pers: remove
little
u
se
d
Pyth
o
n lib
r
ary
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-22
John Kee
p
ing
rev-parse(1): logically group options
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-22
John K
e
ep
i
ng
rev-parse
:
rem
o
v
e
r
e
strictio
n
s
on some options
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-08
J
o
hn Keeping
pull:
c
hange
t
he description to "integrate" changes
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
John Ke
e
ping
p
u
sh: a
v
oid su
g
g
e
sting "mergi
n
g" remote
ch
a
ng
e
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
John Keepin
g
gi
t
-config(1):
c
l
a
rif
y
preced
e
nce of multip
l
e values
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-03
J
ohn Keeping
git-config: up
d
ate doc for --get with multiple valu
e
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-30
John Keepin
g
completion: learn
abou
t
-
-man-path
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-30
Joh
n
Keeping
co
m
p
l
etio
n
: handle u
n
st
u
ck
f
or
m
of base git opti
o
ns
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John Keepi
n
g
fast
-
import
:
allow
m
ov
i
ng the root
tree
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Keeping
fast-import: all
o
w
l
s or filec
o
py
of the r
o
ot tree
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-impo
r
t: se
t
vali
d
m
ode o
n
root
t
ree in "ls"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John K
e
eping
t
9300: document fast-
i
mpor
t
e
m
pty path iss
u
es
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
J
oh
n
Keepin
g
submodule: drop the top-level requirement
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
re
v
-parse:
a
d
d
--prefix option
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n Keeping
submodule: show full pa
t
h in error
m
essage
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403: add
mi
s
sing && chaining
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keepin
g
t7403:
moder
n
iz
e
style
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
n
g
t7401: make indentatio
n
con
s
i
s
te
n
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
mergetool--lib: refactor {diff,mer
g
e
}
_cm
d
logic
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
epin
g
Documentation/Ma
k
efile: m
o
ve infodir to be with other
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keepin
g
Documentation/Makefile: fix sp
a
ces around assignments
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-12
John
K
eep
i
ng
add--in
t
eractive:
r
e
spect diff
.
algorithm
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-07
Jo
h
n Keeping
git-gui: fix file name handl
i
ng with non-empty prefix
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
fetch: do
n
'
t try to update u
n
fetched
t
racking re
f
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-17
J
o
hn Keeping
difftool
:
fi
x
dir-di
f
f wh
e
n f
i
le doe
s
n
o
t exist in
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-07
John K
e
eping
merge-t
r
ee: handle director
y
/empty confl
i
ct corre
c
t
ly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-06
John Ke
e
p
ing
t/Makefil
e
: d
o
n
'
t
define TEST
_
RESULTS_
D
IRECTORY rec
u
rsively
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-01
J
ohn K
e
ep
i
ng
contri
b
/subtree: don't delete remote
b
r
an
c
hes if spl
i
t
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-29
J
o
hn Keeping
test out
p
ut:
r
espect $TEST_OUTPUT_DIRECTO
R
Y
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
John Ke
e
ping
t/Makefile: rem
o
v
e
smoke test targe
t
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
John
Ke
e
ping
merge-tree:
f
i
x
typo
i
n "both change
d
ide
n
t
i
c
a
lly"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-27
John Ke
e
ping
t/
M
ak
e
file: fix resu
l
t
handling wi
t
h T
E
ST_OU
T
P
U
T_DIRECTOR
Y
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn
K
eeping
transport-
h
e
l
per: ad
d
'signed-tags' capability
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keepi
n
g
trans
p
ort-help
e
r: pass --si
g
ned-tags=
w
a
r
n-strip to
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
p
i
ng
fast-export:
add --
s
igned-tags=warn-strip
m
ode
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keepin
g
t
/
test-lib
.
sh: fix TRAS
H
_
DIRE
C
TOR
Y
hand
l
ing
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-08
Jo
h
n Keeping
m
e
r
ge-tree: don't print entries that ma
t
ch
"local"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-07
John Keepi
n
g
gi
t
remote-helpe
r
s(1): c
l
arify r
e
fspec
b
eha
v
iour
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
submodule: print graph ou
t
put next to s
u
bmodule log
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
dif
f
: allow unstuck arguments with --
d
iff-a
l
g
orith
m
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John Kee
p
ing
git-merge(1): d
o
cument dif
f
-
a
l
g
o
rithm option to merge
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn Keeping
bisect: avoid signed integer overflow
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn Keep
i
ng
diffcore-brea
k
: don't div
i
de by
z
ero
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7
8
00: run --d
i
r-diff
tests with and without symlinks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keepi
n
g
t7800:
f
ix tes
t
s when difftool uses --n
o
-symlinks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
t7
8
00: don'
t
hide grep output
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
diff
t
ool: don't overw
r
ite modi
f
ied files
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John
K
e
e
ping
t78
0
0: m
o
ve '--symlinks' specific test
t
o the end
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-27
John Kee
p
ing
merge-tr
e
e:
fi
x
typ
o
in mer
g
e-tree
.
c::u
n
resol
v
ed
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
re
f
s
.
c
:
fix fread error ha
n
dling
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Keeping
e
n
try: fix f
i
lter looku
p
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2003: modernize style
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
difftool
--dir-di
f
f: symlink all files matchi
n
g t
h
e
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eeping
diff
t
ool: avoid doub
l
e
slashes i
n
symlin
k
targets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-difftool(1):
f
ix
f
ormatting
o
f
--symlink descript
i
on
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-04
J
o
hn Keeping
Re
v
er
t
"
grap
h
.
c
: mark private
f
ile-scope
s
ymbols a
s
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-25
John Ke
e
ping
M
a
k
efile: make mandir, htmld
i
r and infodir abs
o
lut
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
rebase -i: respect core
.
c
o
mmen
t
char
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
c
ombine-diff
.
c: teach comb
i
ned diffs about line pre
f
ix
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n Keeping
diff
.
c: use di
f
f_
l
ine_prefix
(
) where applicable
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keepi
n
g
diff: add diff_lin
e
_p
r
efix f
u
nction
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
di
f
f
.
c
:
ma
k
e const
a
nt
s
tri
n
g
argume
n
ts
c
o
n
st
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
diff: write prefix
to the corr
e
ct f
i
le
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-07
J
o
hn Keeping
graph
:
o
utpu
t
paddin
g
fo
r
merge subsequent parents
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t40
3
8
:
a
d
d tests for "diff --cc --raw <trees>"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John
K
e
e
ping
b
u
iltin/appl
y
: tighten (
d
i
s
)
similari
t
y
i
n
d
ex
p
a
r
sing
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
Joh
n
K
e
eping
m
e
rge
t
ool--lib: list user c
o
nfigured tool
s
in '--tool
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Rename {git- => git}
r
emote-helpe
r
s
.
txt
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
Cod
i
ngGuidelines: add P
y
t
h
on coding
g
uide
l
ines
commit
|
commitdiff
|
tree
2013-01-28
J
o
hn
Keeping
git-rem
o
te-testpy: fix path
hashing on Pyth
o
n 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
mergetool--lib: do
n
't cal
l
"exit" in
s
etup_tool
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
g
it-
d
ifftool:
u
se git-
m
e
r
getool--li
b
for "--to
o
l-help"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-m
e
rgetool: don't hard
c
ode
'merge
t
ool' in show_tool_help
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n K
e
eping
git-merge
t
ool: remove redund
a
nt ass
i
gnme
n
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git
-
me
r
ge
t
ool: m
o
ve show_tool
_
he
l
p
to mergetool--lib
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eepin
g
git-remote-testpy: ca
l
l pr
i
nt
a
s a fun
c
t
i
on
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git
-
r
e
mote-tes
t
p
y: don't do
unbuffered tex
t
I
/
O
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
next