repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
completion: handle --[no-]fork-point options to git-rebase
2014-01-13
Joh
n
K
e
eping
completion: ha
n
dl
e
-
-
[no-]fork
-
point opt
i
ons to git
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-13
Joh
n
K
e
eping
co
m
pletion: co
m
plete mer
g
e-
b
ase o
p
tions
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
rebas
e
: use re
f
log to find com
m
on base with
u
pstre
a
m
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-12-09
John Ke
e
ping
pull: us
e
merge-b
a
se --fork-point when appropriate
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John
K
eeping
peek-rem
o
t
e
:
r
em
o
ve
depr
e
cated
a
l
ias of l
s
-remo
t
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
l
o
st
-
found
:
remove deprecated command
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
ta
r
-tree: re
m
ove depr
e
cated command
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Keeping
repo-config: remove
d
ep
r
ecated alias for "git config"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
Documentation/M
a
kefile: make
Asci
i
Doc
d
blatex d
i
r
configurable
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
merge-r
e
cursive: fix parsing of
"diff-algorithm" op
t
ion
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-13
J
ohn Keeping
rese
t
: handle submodule with trailing
s
lash
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-13
John
Keeping
rm: r
e
-use
p
arse_path
s
pec's
trai
l
ing
-
slash removal
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-09
John
Keeping
git_remote_
h
elpers: rem
o
ve little used
P
ython library
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-22
John
K
ee
p
ing
rev-pars
e
(1): logicall
y
group optio
n
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-22
J
o
hn Kee
p
ing
rev-
p
ars
e
:
remove restrictio
n
s o
n
some
o
p
tions
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pull
:
ch
a
nge t
h
e d
e
scription to "integrate" cha
n
g
e
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
push
:
a
v
oid s
u
ggestin
g
"mer
g
ing"
remote changes
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
git-confi
g
(1): clarify
p
recedence of mu
l
ti
p
l
e
v
a
l
ues
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
gi
t
-config: updat
e
doc for --get wit
h
multiple values
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-30
J
o
hn Keeping
comple
t
ion: learn abo
u
t
--man-path
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-30
Jo
h
n Keeping
compl
e
tion: handl
e
unst
u
ck form
o
f b
a
se git
o
p
tion
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-imp
o
rt: allow
m
oving the root tree
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John
K
eeping
fast-import: allow ls
or
filecopy of t
h
e root tree
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n K
e
eping
fast-import
:
set valid mo
d
e on root tree in "ls"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t93
0
0: document fast-import empty p
a
th issues
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Kee
p
i
n
g
subm
o
dule: drop
the
t
o
p-level re
q
uirement
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
r
ev
-
parse: add --prefix option
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
subm
o
dule: show full pa
t
h
i
n
e
rror message
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
J
oh
n
Keepi
n
g
t7403: add
m
issing &&
c
haini
n
g
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
t7
4
0
3
: mo
d
e
r
ni
z
e style
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keepin
g
t7401: make indentatio
n
consistent
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
mergetool--li
b
: ref
a
ctor {diff,merge}_
c
md logi
c
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Kee
p
ing
Documentation
/
M
a
kefile: move infodir
to be with other
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keepin
g
Documentation/Makefile:
f
ix spaces around
ass
i
g
nments
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-12
J
o
hn
K
eeping
add-
-
interactive: respect
diff
.
algorithm
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-07
John Kee
p
ing
g
it-gui: fix fi
l
e name hand
l
i
n
g
with non-empty prefix
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-28
John
Kee
p
ing
fetc
h
: don't t
r
y to update 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
le
does not exist i
n
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-
t
r
ee:
handl
e
dir
e
ctory/emp
t
y conflict correctly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-06
J
o
hn K
e
eping
t/Makefile: don't define TEST_RESULTS_DIRE
C
TORY re
c
u
rsive
l
y
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-01
J
o
hn Keeping
contrib/subtree: don't delete remote br
a
nches
i
f split
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-29
John Keepin
g
test output: respect $TEST_OUTP
U
T
_DIRECTORY
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefile: remo
v
e smoke tes
t
targe
t
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
Jo
h
n Keeping
merge-
t
ree: f
i
x typo in "both
c
han
g
ed identical
l
y
"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-27
Jo
h
n
K
eeping
t
/
M
a
kefi
l
e
:
fix result han
d
ling wi
t
h TE
S
T_OUTPUT_DIRECTORY
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
tran
s
port-helper: add 'sig
n
ed-tags
'
capabilit
y
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
eping
transport-
h
elper: pass
--si
g
ned-tags=warn-strip to
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-export: add --signed-tag
s
=
w
arn-s
t
rip
mode
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
eping
t/test-lib
.
s
h
: fix T
R
AS
H
_DIRECTORY handlin
g
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-08
Joh
n
K
e
ep
i
n
g
merge-tree: don't print entries that match "local"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitremo
t
e-help
e
rs(1):
c
larify refs
p
e
c
b
ehaviou
r
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn Ke
e
ping
sub
m
odule: print graph output next to
submodule log
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John
K
e
e
ping
diff:
allow uns
t
uck argum
e
n
ts wit
h
--diff-
a
l
g
orit
h
m
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John Keepi
n
g
git-me
r
g
e
(1)
:
doc
u
ment diff-algorithm opti
o
n to
m
erge
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisect
:
a
void signed int
e
ger overfl
o
w
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
John
K
eeping
diffc
o
re-b
r
e
a
k
: don
'
t
divide
by zero
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800:
run --dir-diff tests
w
ith and without sym
l
inks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John
K
e
e
ping
t
7
80
0
: fix tests when difftool uses --no-symlinks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
t7800: don't hide grep outp
u
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
difft
o
ol: don't
o
ve
r
w
r
ite modified files
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
K
e
eping
t7800: move '--s
y
m
links'
s
p
ecific test to
t
he
en
d
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-27
Jo
h
n Keeping
merge-tr
e
e: fix typ
o
in merge-tre
e
.
c
:
:unres
o
l
v
ed
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-24
John Keepin
g
ref
s
.
c: fix
f
r
e
ad
e
rror handling
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entry: fi
x
filter lookup
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Keeping
t2003: m
o
dernize
style
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keepin
g
difftool -
-
dir-diff: symli
n
k
all f
i
le
s
ma
t
c
hing
t
he
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Kee
p
i
n
g
diffto
o
l: avoid double sla
s
hes
in symlink ta
r
gets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
git-diff
t
oo
l
(
1
)
: fix formatt
i
ng
o
f
-
-
symlink description
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-04
John Keepin
g
Rever
t
"graph
.
c:
m
a
r
k
pri
v
ate
file-scope sym
b
ols as
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-25
John
K
eeping
Makefile: make mandir, htmldi
r
and i
n
fodir
a
bsol
u
te
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
r
ebase
-i: respect core
.
commentchar
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
combine-diff
.
c:
teach co
m
b
i
n
e
d di
f
fs
a
bout line p
r
efix
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
diff
.
c
:
use diff_line_pr
e
fix() where applicable
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
e
p
ing
diff: add
diff_
l
ine_prefix f
u
nctio
n
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
diff
.
c:
make constant string
a
rguments const
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
di
f
f: write prefix to the
c
orrect file
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-07
John Keepin
g
graph
:
output
padding for merge subseq
u
e
n
t par
e
n
ts
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t40
3
8:
a
dd tests for "diff --cc --raw <
t
rees>"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
bu
i
ltin
/
apply: tight
e
n
(
dis)sim
i
lari
t
y index pars
i
ng
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John Ke
e
ping
mergeto
o
l--lib: list user configured tools in '--
t
ool
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
R
e
n
ame {git- =>
git}remote
-
helpers
.
txt
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
CodingGuideli
n
es: add Python coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
John
Ke
e
pin
g
git-remote-testpy: fix path has
h
ing on Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-28
John Kee
p
ing
m
er
g
etool--lib:
don't
c
a
ll "exit
"
in setu
p
_t
o
ol
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git-dif
f
tool: use
git-m
e
rg
e
tool-
-
lib for "-
-
t
ool-help"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-me
r
ge
t
ool: don
'
t h
a
r
dcode
'm
e
rgetool' in show_tool_help
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergetool: remove redundant as
s
ignment
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git
-
mergetool:
m
o
ve
s
how_to
o
l_help to mergetoo
l
--lib
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
-rem
o
te-
t
estpy: call
p
r
i
n
t
as a function
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Kee
p
ing
git-remote
-
t
e
stpy: don'
t
do unbu
f
fered t
e
xt I/
O
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t-remote-testpy: ha
s
h
bytes
e
xplicitl
y
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
sv
n
-fe: allow
svnrdump_si
m
.
py
t
o
run with Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
g
i
t_re
m
ote_helpers:
use 2
t
o3 if building
w
ith Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
_remote_h
e
lpers: force rebuild if
p
ython versi
o
n
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-24
John Keepi
n
g
g
it-c
v
simport
.
txt
:
cvsps-2 is d
e
precated
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 sup
p
orted date f
o
r
m
a
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-21
John Keep
i
n
g
git_remote_helpers: fix input whe
n
running u
n
der
P
yt
h
o
n 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-21
John
K
e
e
ping
git_remote
_
helpers: allo
w
buil
d
ing with Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-17
Jo
h
n
K
e
eping
git-svn: teach find-rev to find near matche
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fast-imp
o
r
t
(1)
:
reorgan
i
se
option
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
next