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://github.com/git-l10n/git-po
2013-10-03
John Keeping
Docu
m
entation/M
a
k
efile: m
a
ke As
c
i
iD
o
c dblatex dir co
n
figurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John K
e
e
ping
mer
g
e-recursive: fix parsing of "diff-algorithm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
o
hn Keepin
g
r
e
set: handle s
u
bm
o
d
u
l
e with trail
i
ng
slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John
K
e
eping
rm: re-use parse_pathspec's tra
i
lin
g
-slash
r
emoval
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John
K
eeping
git_remote_helpers: remo
v
e little
used Pyth
o
n library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-parse(1):
logi
c
a
l
ly group
o
ptions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
ohn Keeping
re
v
-parse:
remove restrictions on some options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Kee
p
ing
pul
l
: change the description
to "integrate"
changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
p
u
sh: avoid suggesting "me
r
gin
g
"
r
emote change
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Joh
n
Keeping
git-config(1): clar
i
f
y precedenc
e
o
f mult
i
ple
values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
g
it-con
f
i
g
: update do
c
fo
r
--get with multiple v
a
lue
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
co
m
pletion: lear
n
about --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
o
h
n
Keeping
c
om
p
l
etion:
h
andle unstu
c
k form of base
g
it optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Ke
e
pi
n
g
fas
t
-import: allow movin
g
the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-im
p
ort: allow ls or
f
ilecopy of the ro
o
t tr
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-import: set valid m
o
de
o
n root
tree in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
Keeping
t9300:
docum
e
n
t
fas
t
-import empty path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Ke
e
ping
su
b
m
odu
l
e:
d
rop the top-
l
evel re
q
uirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepin
g
rev-parse:
add --prefix opti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submo
d
ule: show fu
l
l
p
ath in error m
e
ssag
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t
7
403: add miss
i
ng &
&
chai
n
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403: mode
r
ni
z
e style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
t7401: make indentati
o
n consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Ke
e
ping
mergeto
o
l--lib: refactor {diff,merge}
_
cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn
K
eepi
n
g
D
ocum
e
ntation
/
Makefile: move infodir to be with ot
h
er
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepin
g
Docu
m
entati
o
n/Makefile:
fix spaces aro
u
n
d
a
ssignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
Joh
n
Keeping
add--i
n
teractive:
respect diff
.
algorit
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keeping
git
-
gui: fi
x
f
i
l
e
n
ame hand
l
ing with
non-em
p
ty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John K
e
eping
fetch: don't
try to update unfetched tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Kee
p
ing
difftool: fix dir-diff
w
hen fi
l
e
does not
exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
m
erge-tree: han
d
le dir
e
c
t
ory
/
empty conflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/Makefile: d
o
n't defi
n
e TEST_RESULTS_DIRECTOR
Y
recurs
i
v
ely
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
contrib
/
subtree: do
n
't delete
remote b
r
anches if
split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
J
o
hn
Keeping
test
o
utput: respect $TEST_
O
UTPUT_
D
IRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Jo
h
n Keeping
t/Makefile: remove smoke tes
t
targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Kee
p
i
n
g
mer
g
e-tree:
fix ty
p
o in "both changed identicall
y
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t
/
M
a
kefile: fix resu
l
t
handling with TEST_OUT
P
U
T_
D
I
R
E
CTO
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n Keeping
t
r
anspo
r
t-helper: add 's
i
gne
d
-tags
'
c
a
pabi
l
i
ty
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transport-
h
e
l
p
er: pass --sig
n
ed-tags=warn-s
t
rip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n Keeping
f
ast-export:
a
dd --s
i
gned-tags=warn-strip
mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
/
test-
l
ib
.
sh: fix TRASH_D
I
RECTORY han
d
l
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-tree
:
don't print entri
e
s that match "
l
ocal"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John K
e
eping
gitre
m
o
te-helpers(1): clar
i
fy refs
p
ec beh
a
vio
u
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
submodule: pr
i
nt g
r
a
p
h out
p
ut next to
s
ubmodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn Keeping
diff: allow u
n
stuck
a
r
guments with --
d
iff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
g
i
t
-merge(1)
:
doc
u
m
e
nt d
i
f
f
-algorithm
opti
o
n t
o
merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
ohn Keeping
bisect:
avo
i
d
signed integ
e
r
o
v
erflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Jo
h
n
K
eeping
di
f
fcore
-
b
reak: don't div
i
de by
z
ero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eeping
t7800
:
run --dir
-
diff tests with and witho
u
t
symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
t7800: fix t
e
sts wh
e
n difftool
u
s
e
s --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Keeping
t7800: do
n
't hide grep outp
u
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepi
n
g
difftool: don't o
v
erwr
i
t
e
modi
f
i
ed f
i
les
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: move '--
s
ymli
n
ks' specific test to th
e
e
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
oh
n
Keepi
n
g
merge-
t
ree: fix typo in merge-tree
.
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 ha
n
dling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
h
n
Keeping
entry
:
f
i
x
filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
t2003: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Kee
p
ing
difftool
-
-dir-diff:
s
ymlink all files mat
c
hing the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepi
n
g
difftool: avo
i
d
d
ouble
s
lashes in symlink t
a
rgets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
gi
t
-di
f
ftoo
l
(1): fix for
m
at
t
ing of --
s
ymlink de
s
cription
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John
K
eepi
n
g
Revert "graph
.
c: mark private file-scope s
y
mbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keepi
n
g
Makefile: make mandir, htm
l
di
r
and infod
i
r abs
o
lu
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
r
ebase
-i: respect core
.
comment
c
har
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
i
n
g
com
b
ine-dif
f
.
c: teach combine
d
diffs ab
o
ut line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
d
iff
.
c: use diff_l
i
ne_pre
f
ix
(
) wh
e
r
e applic
a
b
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
di
f
f: add diff_
l
ine
_
prefix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
if
f
.
c: make c
o
nst
a
nt
s
tri
n
g arg
u
ments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
dif
f
: write prefix to the correct fi
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
graph: o
u
tput pa
d
di
n
g for merge
subs
e
quent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t403
8
:
add tests
f
or "diff
-
-cc
-
-raw <
t
rees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin/apply: ti
g
hten (dis)similar
i
t
y ind
e
x
parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n Keeping
mergetool--lib: list user
conf
i
gured
t
ool
s
in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
oh
n
Keeping
Rename {git- => git}re
m
o
t
e-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
ohn
Keeping
C
o
d
ingGuidelines: add Pyth
o
n coding guid
e
line
s
commit
|
commitdiff
|
tree
2013-01-28
John
K
eeping
g
i
t
-remote-testpy: fix p
a
th ha
s
hing
o
n
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
mergetool--lib: do
n
't call "exit" in
s
etu
p
_
tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n
K
eeping
git-
d
ifftool
:
u
s
e git-merge
t
ool--
l
ib for "--
t
o
ol-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git-merge
t
ool: don't hardc
o
de '
m
e
r
getool'
i
n
s
h
o
w
_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Kee
p
i
ng
git-merge
t
ool: re
m
ove redundan
t
assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n Keeping
gi
t
-mergetool: move sh
o
w_t
o
ol_help
t
o
mergetool--li
b
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn K
e
eping
g
it-rem
o
te-testpy: call p
r
int as a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git-remote-testpy: don't do unb
u
ffered
t
e
xt I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote-
t
estpy: hash bytes explici
t
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
sv
n
-fe: all
o
w
s
vnrdump_sim
.
py to
r
u
n wi
t
h
P
y
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_re
m
ote_helpers: use 2to3 if b
u
ilding with Py
t
h
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_remot
e
_helpers: force rebuil
d
if pytho
n
v
e
rsio
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
Joh
n
K
eeping
git-cvsimport
.
txt: cvsps-2 is deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John
K
eeping
git-fo
r
-each-r
e
f
.
txt: 'raw' is a supported date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
g
i
t_
r
emote_helpe
r
s: fix in
p
ut when runnin
g
und
e
r Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_re
m
ote
_
helpers: allo
w
bu
i
ldin
g
with
Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keepin
g
git-svn
:
teach find-rev to find near matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
ohn Keeping
g
it
-
f
a
st-imp
o
rt(1
)
: re
o
r
g
anise
option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keepi
n
g
g
it-fa
s
t
-
import(1)
:
c
ombi
n
e d
o
cumentat
i
on of
--[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John
Keeping
g
i
t-shortlog(1): document
be
h
aviour of zer
o
-w
i
dt
h
wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
Joh
n
Keeping
g
i
t
-
fast-
i
mport(1):
remove d
u
plicat
e
'
-
-
done' option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John
K
eeping
Docum
e
ntat
i
on: don't link
to exa
m
pl
e
mail address
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
Joh
n
Keepi
n
g
rebase -i
c
ont
i
nue:
don't skip com
m
its
t
h
at only cha
n
ge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree