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 branch 'hu/cherry-pick-previous-branch'
2013-10-03
John Keep
i
ng
D
o
cumentatio
n
/
M
akefile: make AsciiDoc dblatex dir configurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
m
e
rge
-
recu
r
sive
:
f
i
x parsing of "d
i
ff-algorithm" o
p
tio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
ohn K
e
ep
i
ng
r
eset: ha
n
dle submo
d
ul
e
with
t
r
ailin
g
sla
s
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John
Keepi
n
g
rm: re-use pa
r
se_pathspec's trailing-sl
a
sh r
e
moval
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Keeping
git_remote_hel
p
e
rs: r
e
m
o
ve little
used P
y
t
h
o
n lib
r
ary
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
Jo
h
n Keeping
rev-parse(1): logically group opt
i
on
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Kee
p
ing
r
ev
-
pa
r
s
e: re
m
o
ve re
s
tri
c
tions on
s
ome
optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
Joh
n
Keeping
pull: change t
h
e
d
e
sc
r
iption to "i
n
te
g
rate"
c
h
a
n
ges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keepin
g
push:
a
vo
i
d suggestin
g
"merging
"
remote cha
n
ge
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
git-config(1
)
: clarify prec
e
dence
of multiple valu
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Ke
e
p
in
g
g
i
t-config: upd
a
te doc for
-
-ge
t
with mul
t
iple value
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Jo
h
n
K
e
e
ping
completion:
l
earn
a
bout --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Joh
n
Keeping
com
p
letion: hand
l
e unstuck fo
r
m of bas
e
gi
t
o
ptions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
Ke
e
ping
fast
-
import
:
a
l
low mo
v
ing the ro
o
t
tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-import: allow ls o
r
file
c
op
y
of
the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-im
p
o
rt
:
set valid
mode on root
tree in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n Keep
i
ng
t9300
:
docu
m
ent fa
s
t-impor
t
e
m
pty path i
s
sues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule: drop th
e
top-
l
evel requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keeping
rev
-
parse: add --pre
f
ix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
submodule: show full pa
t
h in error m
e
s
sage
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t74
0
3:
a
dd missing
&
& ch
a
ining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
t7403: mode
r
nize
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
i
ng
t7401
:
make indentation c
o
nsistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
m
ergetool--l
i
b: refactor {
d
iff,
m
erge}_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Docum
e
ntation/
M
akefile: mo
v
e inf
o
dir
to
be wit
h
other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Documentati
o
n/Makefile: f
i
x s
p
aces aroun
d
assignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
J
o
hn Kee
p
ing
a
d
d--interactive: respect diff
.
al
g
orithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keeping
g
it-gui: fix fi
l
e name
h
andling with
n
on-empty
p
r
e
f
i
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
Jo
h
n Keeping
f
etch
:
d
o
n
't t
r
y to
u
pdate
u
nfetched
t
rack
i
ng refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John K
e
eping
diff
t
o
o
l
:
fix
d
ir-
d
iff w
h
en fi
l
e
does not ex
i
st
in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
J
ohn Keepi
n
g
merge-tree
:
h
a
ndle dir
e
c
t
ory/empty conflic
t
correctl
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/Makefile: don
'
t
def
i
ne TEST
_
RESULTS_
D
IRECTO
R
Y recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
Joh
n
Ke
e
p
i
n
g
cont
r
i
b/subt
r
e
e
: don't
del
e
te remote br
a
nches if
s
plit
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John K
e
eping
test output:
respec
t
$TEST_OUTPUT_DIREC
T
O
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Joh
n
Keeping
t/
M
akefile: remove s
m
oke te
s
t targ
e
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
h
n
Keepi
n
g
merge-tree:
fi
x
typo in
"bot
h
changed i
d
e
ntically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
J
o
hn Keeping
t/M
a
kefile: f
i
x res
u
lt han
d
ling with TEST_
O
U
TPUT
_
DIRECT
O
RY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transport-helpe
r
: add 'signed
-
tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
trans
p
or
t
-helper: pass --signed-tags=warn-st
r
ip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fas
t
-export:
a
dd --
s
i
gned-
t
ags=warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keeping
t/t
e
s
t
-
lib
.
s
h
: fix TR
A
SH_D
I
RECT
O
RY
h
andl
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keep
i
n
g
merge-
t
ree: don't print en
t
r
i
es that match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
J
o
hn
K
eeping
gitr
e
mote-h
e
lper
s
(1):
c
lari
f
y refspec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
K
eep
i
ng
submodule: print
gra
p
h output next
to
sub
m
odul
e
log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
Keepin
g
diff: allow
unstuck a
r
guments with --diff-alg
o
ri
t
hm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n Keepin
g
git-merg
e
(
1
): docu
m
ent
d
if
f
-algorithm option to merg
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Keepin
g
bisect: av
o
id
signed integ
e
r
overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
h
n Keeping
di
f
fcore-break: don't
d
ivide by
zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Ke
e
ping
t7800:
run --dir-
d
iff tests wi
t
h and without
s
ym
l
inks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepin
g
t7800: fix tests
w
hen difftool uses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: don't
h
ide grep
o
utpu
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
di
f
ftool: don't overwrite m
o
dified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n
K
eeping
t7800: move '--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-tree: fix typo in merge-tree
.
c
:
:unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John K
e
epi
n
g
refs
.
c:
fix fread e
r
r
o
r handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entry:
f
ix f
i
l
ter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n
K
eeping
t
2
0
0
3: moderni
z
e st
y
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
difftool --
d
ir-
d
iff: symlin
k
all files ma
t
ching
t
he
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
d
i
ff
t
o
o
l: avoid doub
l
e slas
h
es in syml
i
nk targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
ping
git-difftool(1): fix formatting of --s
y
m
link de
s
cript
i
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Rev
e
rt
"
g
r
a
ph
.
c:
m
ark private
f
ile
-
scope
symbo
l
s
as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Makefile: make ma
n
d
i
r, ht
m
ld
i
r and inf
o
dir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
r
ebase -i: respect core
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
combine-diff
.
c: teach c
o
m
b
ined diffs about
l
i
ne prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
diff
.
c: use diff_line_prefix() where
applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eeping
diff: add diff_line
_
pref
i
x function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n
K
eepin
g
diff
.
c
:
make co
n
s
tant
string arguments c
o
nst
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
diff: write pref
i
x to
the correct fi
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
o
hn Keeping
graph:
o
utput padding for merge
subseq
u
ent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John K
e
ep
i
ng
t4038:
a
dd tes
t
s for "diff --cc --ra
w
<tre
e
s>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Ke
e
p
i
n
g
builtin/apply: tighten (dis)s
i
milarity inde
x
p
a
r
sing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
m
e
rgetool--lib:
lis
t
user configured tools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
o
hn Ke
e
pin
g
Re
n
ame
{git-
=
>
gi
t
}r
e
mo
t
e-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
Jo
h
n
K
eeping
CodingGuid
e
lines: ad
d
Python
coding
g
ui
d
elines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
gi
t
-re
m
ote-testpy: fix
pat
h
h
ashin
g
on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
Joh
n
Keeping
merg
e
to
o
l--l
i
b
: don'
t
call "exit" in setu
p
_
tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
-di
f
ftool: u
s
e git-mergetool--l
i
b for "--tool
-
hel
p
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
K
e
ep
i
ng
git-
m
ergetool: don't
hard
c
ode 'mergetool' in show
_
tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git-mergetool: remove redund
a
nt assign
m
ent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-mergetool:
move sh
o
w_tool_he
l
p to mer
g
etool--
l
ib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
g
it-remote-t
e
stpy:
call print as
a
function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Kee
p
i
n
g
gi
t
-remote-t
e
stpy: don
'
t d
o
unbuffered tex
t
I
/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
i
ng
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
s
v
n-
f
e:
allow svnrdump_si
m
.
py to run
with
P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
git_re
m
ote
_
h
elper
s
: us
e
2to3 if b
u
i
l
d
i
ng with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Kee
p
i
ng
g
i
t_
r
e
mote_helpers: f
o
rce
rebuild if python
version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keeping
gi
t
-cvs
i
mport
.
txt: cvsps-2 is depreca
t
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
J
o
hn Keeping
git-for-
e
ach-ref
.
txt: 'raw' is a su
p
ported
d
a
te format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Kee
p
ing
git_r
e
mote_helper
s
: fix
i
nput when runni
n
g under Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
o
hn K
e
epin
g
g
i
t_remo
t
e_
h
elpers
:
allow
build
i
ng with Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John
Keeping
git-svn:
t
each
find-rev to
find near matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
o
hn Keepi
n
g
git-f
a
s
t
-impo
r
t(1): reor
g
anis
e
o
ptions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
g
it-fast-import(
1
)
:
combin
e
docume
n
tat
i
on
o
f
-
-
[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-shortlog(1): docu
m
ent behaviour of
zero-width wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John
K
eeping
g
it-
f
ast-import(1
)
: remove duplicate
'-
-
do
n
e' opt
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John K
e
eping
Documentation: do
n
't lin
k
to example
m
ail addresses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Ke
e
p
ing
rebase -i con
t
inue: don't skip com
m
i
ts that
only ch
a
nge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree