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 'fc/remote-hg' (early part)
2013-05-07
J
o
hn Kee
p
ing
merge-tr
e
e
:
h
a
n
d
l
e
directory/empty c
o
nf
l
i
c
t correc
t
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefile: rem
o
ve smoke test
target
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn Keeping
merge-
t
re
e
: fix typo in
"both
c
han
g
e
d
identica
l
ly"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
pi
n
g
t
r
ansport-he
l
per: ad
d
'sig
n
ed-tags
'
ca
p
abilit
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
ng
transport-hel
p
er: pass
-
-
s
igned-tags=wa
r
n-str
i
p to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n Keep
i
ng
fast
-
e
x
port: add --
s
i
g
ned
-
ta
g
s
=
warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/test-lib
.
sh: fix TRASH_DIR
E
CTO
R
Y handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-tree: don't print e
n
tr
i
es that matc
h
"
l
ocal
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keep
i
ng
gitremote-helpers(1): clarif
y
refspec
b
ehaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Ke
e
ping
submodule
:
p
rint
gr
a
ph output ne
x
t
to submodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
oh
n
Keeping
diff:
allow unstuck arguments
w
i
t
h --diff-a
l
gori
t
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn Kee
p
ing
git-merge(1
)
: docu
m
ent
d
iff-algorithm o
p
tio
n
t
o
merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John K
e
e
p
ing
bisect: av
o
id signed in
t
eg
e
r overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
ohn Keeping
diffcore-break: don't div
i
d
e by
z
ero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Ke
e
ping
t7
8
00: run --di
r
-dif
f
te
s
ts with and wit
h
out s
y
m
links
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
K
e
eping
t7800: fix tests
when difftool uses
-
-no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn
K
eeping
t
7800: do
n
't hide grep outpu
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
difftool: do
n
't overwrite mo
d
ifie
d
files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn
K
eeping
t
7
800: move '-
-
sy
m
links' spe
c
i
f
ic test to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
o
hn Keeping
merge-
t
r
ee:
fix typo in merge-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
J
o
h
n Keepi
n
g
re
f
s
.
c: fi
x
fread error handl
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Keep
i
ng
e
ntry: fix
filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2003: modern
i
ze style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Ke
e
ping
difftool --dir-di
f
f
:
symlink all file
s
mat
c
h
ing
t
h
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
e
e
p
i
n
g
difftool: avoid double slashes
in
s
y
m
lin
k
targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eepin
g
git-difftool(1):
f
ix formatti
n
g o
f
--symlink de
s
cription
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John
K
eeping
Revert "gra
p
h
.
c
:
mark private f
i
le-scope
symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
M
akefil
e
: mak
e
mandir,
h
t
mldir and inf
o
dir
a
b
s
o
lute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
r
ebas
e
-i: respect core
.
co
m
mentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n
K
eeping
com
b
ine-di
f
f
.
c
:
teach combined dif
f
s about
l
ine prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: use diff_li
n
e_prefi
x
(
)
whe
r
e applicabl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff:
a
dd di
f
f_li
n
e_prefix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
diff
.
c: make constant stri
n
g a
r
gu
m
ent
s
cons
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
diff: wri
t
e prefix to the
c
orrect file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
ohn
K
eeping
graph:
o
utput pad
d
in
g
fo
r
merge
s
ubsequ
e
nt parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keepin
g
t40
3
8: add test
s
f
or "dif
f
--cc --raw <tre
e
s>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin/apply: ti
g
hten (di
s
)similarity index p
a
rsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
Keeping
mergetool--li
b
: list us
e
r
configured tools in '--
t
ool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Rename
{gi
t
- => git}remote-
h
elp
e
rs
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
CodingGuidel
i
nes
:
a
dd
P
ython coding gu
i
delines
commit
|
commitdiff
|
tree
2013-01-28
J
o
hn Keepi
n
g
g
i
t-remote
-
t
estpy: fix
pa
t
h hashi
n
g on
Py
t
ho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
mergetool--lib: don't call
"
exit" in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git-difftoo
l
: use git-m
e
rgetool--lib for
"
--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
pin
g
g
i
t-merg
e
tool: do
n
't
hardcode 'mergetool' in s
h
ow_tool
_
help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git-mergetool: remo
v
e
r
edunda
n
t as
s
ignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git-merg
e
tool
:
mo
v
e show
_
tool_
h
elp
t
o mergetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n K
e
e
p
ing
git-r
e
mote-testpy: call
p
r
i
nt
as
a f
u
nction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-re
m
ote-testpy:
d
on't do
unbu
f
fe
r
ed tex
t
I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
-remote-testp
y
: hash bytes expl
i
ci
t
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
svn-fe: allow
svnrdump_sim
.
py to run wit
h
Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git_remot
e
_helpers
:
use 2to3 if building with Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
git_remote_help
e
rs: forc
e
reb
u
ild
i
f python versio
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John
Keepin
g
git-cvs
i
m
port
.
txt: cvsps-2 is depreca
t
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keepi
n
g
git-for-ea
c
h
-
r
ef
.
txt:
'
raw'
is a su
p
ported
date
f
ormat
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keep
i
ng
git_remote_helpers:
fix
input when runn
i
n
g
under Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John
K
eeping
git_remote_helpers: allow building
with Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John K
e
eping
git-svn:
t
each find-
r
ev
to fin
d
near matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keep
i
ng
g
i
t-fast-import
(
1
)
:
re
o
rga
n
ise options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fast-
i
mport(1): c
o
mbine documentation of --
[
no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John
Keeping
git-shortlog(1): document beh
a
v
iour of
z
ero-wi
d
th wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keeping
git-
f
a
s
t-import(1): remove duplic
a
te '--done' option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John Keepin
g
Documentation: don't link to examp
l
e mail ad
d
res
s
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John K
e
eping
rebase -i cont
i
nue
:
d
on't skip commi
t
s tha
t
only
change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree