repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
completion: complete merge-base options
2014-01-13
John Keeping
completion
:
complet
e
m
e
r
g
e-base options
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-12-10
John Keepi
n
g
rebase:
use reflog to
f
ind c
o
m
mon base
w
ith upstream
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-12-09
John Keepin
g
pul
l
: use merge-base --fo
r
k-p
o
int
when a
p
propriat
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
J
o
h
n Keeping
p
e
ek-remote: 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 Ke
e
ping
l
o
s
t-found: remove d
e
prec
a
t
ed
command
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
ta
r
-tree: remove deprecated comman
d
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
repo-config: remove depr
e
cated
ali
a
s for "git co
n
fig"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-10-03
Jo
h
n Ke
e
pi
n
g
Documentation/M
a
kefile: make AsciiDoc dblatex
d
ir co
n
fi
g
u
r
able
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
merg
e
-rec
u
r
sive:
f
ix p
a
r
s
ing of "di
f
f-algorithm"
opt
i
o
n
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
reset: handle
submodu
l
e
with
t
railing slash
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-13
Joh
n
Keepin
g
r
m
:
re-u
s
e pa
r
se_paths
p
ec's trailin
g
-sl
a
sh removal
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-09
John
Keeping
git_remo
t
e_help
e
rs: remove little
u
sed
Python library
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-parse(1)
:
logic
a
l
l
y
g
roup o
p
t
ions
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-22
John Kee
p
ing
re
v
-parse: re
m
ove res
t
ri
c
tions on some options
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-08
John
K
e
e
p
i
n
g
pull:
c
h
a
nge the de
s
crip
t
ion to "integrate" changes
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
push:
avoid suggestin
g
"merging" remot
e
changes
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
J
o
hn Keep
i
ng
git-confi
g
(1)
:
clarify precedence of
m
ultiple v
a
lu
e
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-03
Jo
h
n Keepin
g
git
-
c
o
n
fig: update d
o
c for --ge
t
with
m
ultiple values
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-30
John
Keeping
completi
o
n
: le
a
rn a
b
out --man-path
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-30
John K
e
eping
completion: handle unstuck f
o
rm of base git options
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast
-
i
m
port: allo
w
m
oving the root
t
ree
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Ke
e
pin
g
fast-im
p
o
rt:
al
l
o
w ls
o
r file
c
opy of the root tree
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn Keeping
fast-import: se
t
valid mode on root
t
ree
i
n
"
l
s"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John Ke
e
ping
t9300: document fas
t
-impo
r
t empt
y
p
a
th
i
s
s
u
es
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keep
i
ng
s
ubmodule: drop the top-leve
l
requ
i
r
ement
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
rev-par
s
e: add --pr
e
fi
x
o
p
tion
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodu
l
e
: show full path in error
m
e
s
sage
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
t7403: add mis
s
ing &&
c
hain
i
ng
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403: modernize
s
tyle
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
t7401: mak
e
indentati
o
n consistent
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
m
e
rgetool--li
b
:
r
e
factor {diff
,
merge}_cmd
logic
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
D
o
cum
e
nta
t
i
on/Makefi
l
e
:
move infodi
r
to b
e
with o
t
her
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Documentat
i
o
n
/
M
akefile:
f
ix s
p
aces around assig
n
ments
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-12
John
Keeping
add--in
t
eracti
v
e: respect diff
.
a
l
g
orithm
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-07
John K
e
epin
g
git-gui: fix file name han
d
ling with non-
e
mpty pref
i
x
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
fetch:
d
on't try
t
o
u
pdate unfetched tracking
r
efs
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-17
Joh
n
Keeping
difftool
:
fix dir-dif
f
whe
n
file doe
s
n
o
t
e
x
i
s
t in
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-tree: handle directo
r
y/empty confli
c
t cor
r
ectly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/Makefi
l
e
: d
o
n't def
i
ne TEST_RESULTS_
D
IRECTORY recurs
i
vely
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-01
J
ohn Keeping
co
n
trib/subtre
e
: don't del
e
te rem
o
te branches if split
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
t
e
st output:
resp
e
ct
$TEST_OUTPUT
_
DI
R
ECTORY
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
Joh
n
K
e
eping
t/Makefile: remove s
m
ok
e
test targets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
Jo
h
n Keeping
merg
e
-tree: fix typo
i
n "both changed identically"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-27
J
ohn Keeping
t/M
a
kefile:
f
ix result han
d
ling wi
t
h TEST
_
OU
T
PU
T
_DIRECT
O
R
Y
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
ng
transport-helper:
a
dd
'
signed-tags' capabi
l
ity
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
ing
transp
o
rt-helper:
p
ass --sig
n
ed-tags=warn-st
r
ip to
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Kee
p
ing
fast-e
x
port: add -
-
sign
e
d-tags
=
warn-st
r
ip mode
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/
t
est-lib
.
sh
:
fix TRASH_
D
IRECTORY handling
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-08
John K
e
eping
merg
e
-tree: don't print entri
e
s t
h
at match "local"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitremote-
h
elpers(1): cla
r
ify refspec behaviour
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John Ke
e
pin
g
submodule: print graph output next to subm
o
dul
e
log
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn Keepin
g
d
i
ff: allow unstuck arg
u
ments
w
ith --
d
iff
-
algor
i
thm
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John
Keepi
n
g
git-merge(1): document diff-algo
r
i
t
hm option to merge
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
b
i
sect
:
av
o
id sig
n
ed integer overflow
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
d
iffcore-break: don
'
t divide by
z
ero
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
t7800: r
u
n -
-
dir-diff t
e
sts with and
with
o
ut symlin
k
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keepi
n
g
t7800: fix te
s
ts wh
e
n difftoo
l
uses
--
n
o-s
y
mlinks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t
7800: don't hide grep
o
utput
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
difftool: don't ove
r
write modi
f
i
ed files
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keepi
n
g
t7800
:
m
ove '--symlinks' specific t
e
st
to the end
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-27
J
ohn Keep
i
ng
merge-tree: fix
t
ypo in merge-tr
e
e
.
c::unresolved
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
re
f
s
.
c
: fix fread error
handli
n
g
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keepi
n
g
en
t
ry: fix filter look
u
p
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2003: modernize sty
l
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
pi
n
g
difftool
--dir-d
i
ff
:
symlin
k
a
l
l
fi
l
es matching the
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool: avoi
d
do
u
ble slashes in symlink targets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
g
i
t-difft
o
ol
(
1):
f
i
x format
t
i
n
g of --symlink desc
r
ip
t
i
o
n
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-04
John Keepin
g
R
e
vert "
g
rap
h
.
c: mark
p
r
iv
a
te
f
ile-
s
cope symb
o
ls as
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-25
Joh
n
K
e
e
ping
Makefil
e
:
ma
k
e mandir, htmldir and
i
nf
o
dir
absolute
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn
Keeping
rebase -i: respect
core
.
comment
c
h
ar
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
comb
i
ne-d
i
ff
.
c: teac
h
com
b
ined
diffs abou
t
line p
r
efix
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn
Keep
i
ng
dif
f
.
c: use diff_line
_
pref
i
x()
w
h
e
re applicable
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
d
i
ff:
a
dd diff_line_prefix function
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keepin
g
diff
.
c: m
a
ke constant s
t
r
i
ng argumen
t
s
const
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
epi
n
g
diff: write prefix to the corr
e
ct fi
l
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-07
John Ke
e
ping
graph: output p
a
dding for merge
s
ubsequen
t
parents
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-05
John
K
e
eping
t4038: a
d
d tes
t
s fo
r
"
diff --
c
c --raw <
t
rees>"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n Kee
p
ing
builtin/a
p
ply
:
tigh
t
en (dis)similarity in
d
e
x parsing
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John Kee
p
ing
mergetool--lib: l
i
st user config
u
red tools i
n
'--to
o
l
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
R
ename {
g
it- => git
}
rem
o
te-hel
p
ers
.
txt
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
CodingGuidelines: add Python cod
i
ng
g
uidelines
commit
|
commitdiff
|
tree
2013-01-28
John
K
eeping
git-remote-testpy: f
i
x path hashing on Pyth
o
n 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-28
John
K
ee
p
in
g
merget
o
ol--lib
:
don't ca
l
l "exit" in
setup_tool
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
pi
n
g
git-di
f
ftool: use
g
it-me
r
geto
o
l--lib
fo
r
"--too
l
-h
e
lp"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-m
e
rgetool: don't hardcode 'me
r
g
e
tool' in
s
h
o
w
_
tool
_
h
el
p
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-m
e
r
g
eto
o
l: remo
v
e
redundant assi
g
nment
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
git-me
r
get
o
o
l
: move show_tool
_
he
l
p
to
m
ergetool--lib
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eepi
n
g
g
it-remote-testp
y
: call print
a
s a functi
o
n
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
git-remote-test
p
y: don't do unbuffe
r
ed
text I/O
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Kee
p
ing
git-remote-testpy: hash bytes explicitly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
svn-fe: allow svn
r
dump
_
s
i
m
.
p
y
t
o
run wi
t
h Pyth
o
n 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
gi
t
_rem
o
te_helpers: us
e
2to3 if build
i
ng
with Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keepi
n
g
git_remo
t
e_helpers: forc
e
rebu
i
ld i
f
pytho
n
version
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-24
Joh
n
K
e
eping
g
i
t-cvsimport
.
txt: cvsps-
2
is deprec
a
ted
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-22
John Ke
e
ping
git-fo
r
-each-ref
.
tx
t
: 'r
a
w
' i
s
a
supp
o
rted date f
o
r
m
at
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_
r
emo
t
e_helpers: fix input
w
h
en running u
n
der P
y
thon 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_remot
e
_helpers: allow bui
l
ding with Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-17
John Keepi
n
g
gi
t
-
s
vn:
t
each
find-rev t
o
find near matches
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-f
a
st-import(1):
reo
r
gani
s
e option
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
J
o
hn Ke
e
p
i
ng
git-fast-import
(
1): combine do
c
ume
n
tati
o
n of --[
n
o
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
next