repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge git://git.bogomips.org/git-svn
2014-01-17
John Keeping
pull: suppress
erro
r
when
n
o remoter
e
f is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
J
o
hn Keeping
r
e
bas
e
: fix fork-
p
oint with zero argum
e
nts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
rebase: use reflog
t
o
fi
n
d common base with upst
r
eam
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keepi
n
g
pull: use
m
erge-base --fork-poi
n
t when
a
p
propria
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Joh
n
Kee
p
in
g
peek-remote: remove deprecat
e
d alias of ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
l
ost-found: r
e
move deprecated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John K
e
eping
tar
-
tree: remove deprecat
e
d
c
ommand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keepi
n
g
repo-config: re
m
ove depre
c
ated alias for "git con
f
ig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
Documenta
t
ion/Makefile:
ma
k
e Asc
i
iDo
c
d
bl
a
tex dir c
o
nfigurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
J
oh
n
Ke
e
ping
merge-rec
u
rsive: fix
p
arsing
of "di
f
f
-
a
lgori
t
hm" o
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
ohn Kee
p
in
g
reset: handle s
u
bmodule w
i
th trailing slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
r
m
: re-use parse_pat
h
spec's
t
ra
i
lin
g
-sla
s
h removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
J
o
h
n
Keeping
git_remote_helpers: r
e
move little u
s
ed Python
librar
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Ke
e
p
i
ng
r
ev-parse(1): logically
g
r
o
up options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John
K
eeping
r
e
v-parse: remove
r
es
t
rictions
o
n
so
m
e options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keepin
g
pull: change the de
s
criptio
n
to "inte
g
rate
"
chang
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
push: avoid
s
u
ggesting "mergi
n
g" remote c
h
anges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Joh
n
K
e
e
ping
g
it-conf
i
g
(1): cl
a
r
i
fy preced
e
nce of multiple val
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John
Keep
i
ng
git
-
c
o
nfig
:
up
d
a
t
e
d
oc fo
r
-
-
get wi
t
h
m
ultiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Jo
h
n Kee
p
ing
compl
e
tion: learn about
-
-man-
p
ath
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Jo
h
n Keeping
completion
:
h
andle unstuck f
o
r
m
o
f base git options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-impo
r
t
:
a
llow moving the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John K
e
e
p
ing
f
a
st-import:
allow ls or filec
o
py of the root tr
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n Keep
i
ng
fast-import: set valid mode on root tr
e
e in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
eeping
t93
0
0: document
fas
t
-import e
m
pty path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
submod
u
le: dr
o
p
t
he top-le
v
el requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
ng
r
ev-parse
:
add --p
r
efix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
s
u
bm
o
dul
e
: show full path in error message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
t7403
:
add mi
s
sing &&
chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
t
7403:
m
odernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Kee
p
i
n
g
t7401: make
i
nde
n
t
atio
n
consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
mer
g
et
o
ol--lib: refactor {diff,me
r
ge}_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Docume
n
t
a
t
i
on/Ma
k
efile: move infod
i
r to be with
o
ther
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
D
o
c
u
mentation/Makefile: fix s
p
a
c
es around
a
ssignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Ke
e
ping
add--interactive: r
e
spe
c
t diff
.
alg
o
rithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John
K
eeping
git
-
g
u
i: fix file nam
e
h
andling with
non-
e
mpty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Ke
e
ping
f
e
tch: don't try to upda
t
e unfetched tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
difftool:
f
ix di
r
-
d
if
f
w
h
en file does not exi
s
t in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-tree: hand
l
e di
r
ectory/
e
mpty
c
onflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keepin
g
t/Makefile:
don't def
i
ne
T
EST_RESULT
S
_D
I
R
E
CTO
R
Y recursive
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John
K
eeping
contrib/subtre
e
: don'
t
d
e
lete remote branches if
split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keepi
n
g
test output: respe
c
t
$
TEST_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefile: rem
o
v
e smo
k
e test t
a
rge
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
m
erge-tree:
fi
x
typo in
"
b
oth
c
hange
d
identi
c
ally"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
J
ohn Keeping
t/Makefile: fix
result handling wi
t
h TEST_O
U
TP
U
T_DIRECT
O
RY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
trans
p
ort-helper: add 's
i
gned-tags'
capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
Keep
i
ng
transport-hel
p
er: pass --signed-
t
ags=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keeping
fast-export: a
d
d --signed-tags=w
a
rn-
s
t
r
i
p m
o
de
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/te
s
t-lib
.
sh: f
i
x
T
R
ASH
_
DIRE
C
TORY
h
a
ndlin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John
Keepin
g
merge-tree:
d
on't p
r
int entri
e
s th
a
t
mat
c
h "loc
a
l"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
Jo
h
n K
e
eping
gitremo
t
e-helpers(1): clar
i
fy refspec
b
ehav
i
our
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
Keep
i
ng
submodule: pri
n
t graph output
n
ext
to submodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Ke
e
p
i
n
g
diff: allow uns
t
uck
arguments
with --
d
iff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
Keeping
git-merg
e
(1): doc
u
ment diff-algorithm option to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisect: avoid si
g
n
ed in
t
eg
e
r overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keepin
g
diffcore-bre
a
k: don
'
t d
i
vide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t
7800: run
-
-
di
r
-diff tes
t
s
w
ith and
w
ithout s
y
mlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keeping
t7800
:
fix te
s
ts
when
d
if
f
t
o
ol use
s
--n
o
-symlink
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
e
ep
i
ng
t78
0
0: don't
h
ide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
difftool: don't overwrite
m
odif
i
ed files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keep
i
ng
t7
8
00: move '--s
y
mlinks' specific te
s
t
t
o the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John
Kee
p
ing
me
r
ge
-
tree: fix
typo in merge-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
Joh
n
Ke
e
ping
refs
.
c: fix fread e
r
r
or handli
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keepi
n
g
e
n
t
r
y: fi
x
filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Kee
p
ing
t
2
003: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool --dir-diff: symlink all
files matching
t
he
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Ke
e
ping
difftool: avoid double
s
lashes
in
symlink targ
e
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepi
n
g
git-difftool(1)
:
fix
formatting of
-
-symlink description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
Jo
h
n Keeping
Reve
r
t "graph
.
c: mark p
r
ivate f
i
le-
s
cop
e
s
ymb
o
l
s
a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
M
a
ke
f
i
l
e: make
m
a
ndir, htmld
i
r and infodi
r
ab
s
olute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keep
i
ng
rebase -i:
re
s
pec
t
core
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
p
i
ng
combine-diff
.
c:
teach comb
i
ned d
i
ffs about line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eep
i
ng
diff
.
c: u
s
e diff_line_prefix() where applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
diff: add
diff_line_pre
f
ix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: make consta
n
t string
arguments con
s
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
d
i
ff:
write prefix to t
h
e corr
e
ct
f
il
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
g
r
aph: out
p
ut padding for me
r
ge s
u
bsequent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t4038
:
a
d
d tests for
"dif
f
-
-
c
c --ra
w
<trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin/apply: tighten (dis)similarity index
p
a
r
s
i
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
me
r
getool--lib: list user co
n
f
i
gured
tools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
Joh
n
Keep
i
ng
Rename {git-
=
> git}remote-he
l
pers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John
Keeping
Codin
g
G
u
i
d
elines:
add Pyt
h
on
c
o
ding guidelines
commit
|
commitdiff
|
tree
2013-01-28
J
ohn Keeping
git-remote-testpy:
f
ix pa
t
h hashing on
P
yth
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
merget
o
ol--lib: don't call "ex
i
t"
i
n setup_
t
ool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n
Kee
p
ing
git-d
i
fft
o
o
l: use
git-m
e
rge
t
ool--lib for
"
--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git-mergetool:
d
on't ha
r
dc
o
de 'mergetool' in show_tool_
h
elp
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
git-me
r
getoo
l
:
r
emove redu
n
d
a
nt
a
ssignme
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mer
g
etoo
l
: move sho
w
_tool_help to m
e
rg
e
t
ool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git-re
m
ote-testp
y
: ca
l
l pr
i
nt as a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git-remo
t
e-test
p
y: don't do un
b
uffered text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git-re
m
ote-testpy: ha
s
h
by
t
es explic
i
tly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keep
i
n
g
svn
-
fe: allow svn
r
dump_si
m
.
py to run w
i
th
Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t
_remote_helpe
r
s: use 2to3
if
building
w
ith Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
epin
g
g
i
t_rem
o
te_helpers:
f
or
c
e re
b
u
i
l
d
if python
v
e
r
sion
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Ke
e
p
ing
g
i
t-cvsimport
.
txt: cvsps-2 is de
p
recated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keeping
g
it-for-e
a
ch
-
ref
.
txt: 'raw'
is a supported date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
o
hn Ke
e
ping
git_remote_helpers: fix input
w
hen r
u
nning under
P
ython 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
Joh
n
Keeping
git_remote_helpers: allow building with Pyt
h
on 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
J
o
hn Keeping
git-svn: teach f
i
n
d-
r
ev to find near mat
c
h
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John K
e
ep
i
ng
git-fa
s
t-import(1): reorga
n
ise
o
pt
i
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next