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
Git 1.8.3-rc2
2013-05-07
John Keepin
g
merge
-
tree: handle directory/empty conflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/
M
akefile: r
e
move smoke te
s
t t
a
rgets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John
K
eepin
g
m
erge-tree: fix typo in "b
o
t
h
changed identica
l
ly
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
Keepi
n
g
t
r
ansport-helper: add
'signed-ta
g
s' capabil
i
ty
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Keepin
g
tra
n
sport-helper:
pass --
s
igned
-
tags=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepi
n
g
fa
s
t-export: add --signed-t
a
gs=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 TR
A
SH_DI
R
EC
T
ORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-tre
e
: don't print
e
ntr
i
es that m
a
tch "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Ke
e
ping
gitremote
-
helpers(1): clarify re
f
spec behav
i
our
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
Ke
e
p
i
ng
sub
m
od
u
le: print graph
o
utpu
t
next t
o
s
u
bmodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
Keepin
g
diff
:
allo
w
unstu
c
k arguments
with
--diff-al
g
orithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
Keep
i
ng
git-merge(1): document diff-algori
t
h
m opt
i
on to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
ohn
K
eeping
b
is
e
c
t
: a
v
oi
d
signed i
n
teg
e
r overflo
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Kee
p
in
g
diffc
o
r
e
-b
r
e
a
k: don't divide by zer
o
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: run
--d
i
r-diff
t
ests wi
t
h
a
nd without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepi
n
g
t7800: fix tests whe
n
difftoo
l
u
s
es
-
-no-s
y
mlin
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keepin
g
t7800:
d
on't
hide grep outpu
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
difftool:
don't overwrite modified fi
l
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: move '--sy
m
links' spe
c
ific te
s
t
to t
h
e en
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
ohn Ke
e
p
i
ng
m
erge-tree: fix typo in mer
g
e-tree
.
c:
:
unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c: fix fr
e
ad error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepin
g
entry: fix filte
r
lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Keeping
t2003: mod
e
rni
z
e
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
h
n
Keep
i
ng
difftoo
l
--dir-dif
f
:
s
ymlink all files matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool: avoid doubl
e
slashes in sym
l
in
k
targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Keeping
git-diffto
o
l(1):
f
ix f
o
rmattin
g
of --symli
n
k description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keep
i
ng
Revert "
g
raph
.
c: mark private file-scope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
M
akefile:
make
man
d
ir, htm
l
dir and in
f
odir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
K
e
ep
i
n
g
reb
a
s
e
-i: r
e
s
pect
core
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
combin
e
-
di
f
f
.
c: te
a
ch combi
n
e
d di
f
fs a
b
out line
p
refix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eeping
dif
f
.
c:
use diff_line_prefix() w
h
e
re applicab
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
d
i
ff: add
d
iff_line_pref
i
x function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n Kee
p
ing
diff
.
c: make constant strin
g
arguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
d
i
ff: writ
e
prefix to
the
correct
f
il
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Kee
p
ing
gr
a
ph: output pad
d
in
g
fo
r
m
erge subsequent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John
K
e
eping
t4038: add tes
t
s for "diff -
-
cc --r
a
w <t
r
ees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John K
e
ep
i
ng
b
uiltin/apply: tig
h
ten
(dis)si
m
ilari
t
y
index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n
Keeping
mergetool--
l
ib: list user co
n
fi
g
u
r
e
d
tool
s
i
n
'--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Rename {git
-
=> git}remote-
h
elper
s
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
C
o
d
i
ngGuidelines: add Python coding guideline
s
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-
r
emo
t
e-testpy: f
i
x
path hashing on Pyt
h
o
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
mergetoo
l
--lib: d
o
n
't call "exit" in set
u
p_to
o
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
i
n
g
git-di
f
ftool:
u
se
g
i
t
-
m
erge
t
oo
l
--lib for "--tool-he
l
p"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergetool:
don
'
t hard
c
ode 'mergeto
o
l' in
show_t
o
ol_h
e
l
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
-mergeto
o
l: remove redundant ass
i
gnme
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-me
r
get
o
ol
:
mo
v
e sho
w
_t
o
ol_help
t
o
m
e
rgetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t-
r
e
m
ote-testpy: call print as a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git
-
r
em
o
te-testpy: don
'
t
do
un
b
uffered
tex
t
I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Ke
e
p
i
n
g
git-rem
o
t
e
-
te
s
tpy: hash b
y
tes
ex
p
licitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
p
i
ng
svn
-
f
e
: allow svnrdump_sim
.
py t
o
run w
i
th Pyth
o
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_remote_
h
elper
s
: use 2t
o
3 if building
w
ith Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t_remote_
h
elpers: force
re
b
uild if python version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Ke
e
p
ing
git-cvsimpo
r
t
.
txt: cvs
p
s-2 i
s
d
e
precated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John
K
eeping
git-fo
r
-ea
c
h-re
f
.
txt: 'r
a
w' is a suppo
r
ted d
a
t
e
forma
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
gi
t
_
r
emote_helpers:
f
ix input when run
n
ing
u
nder Py
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John
Keeping
git_
r
emote_helpers:
a
llow b
u
ilding with
P
ython 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keeping
git-s
v
n:
tea
c
h find-rev to find near
m
atches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
Joh
n
Kee
p
i
n
g
g
it
-
fast-i
m
port(1): reorganise
o
ptions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keepin
g
git-fast-
i
mport(1): combi
n
e
d
ocumen
t
ation
o
f --[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
g
it-shor
t
log(1):
d
o
cument
be
h
aviour of zero-widt
h
wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John
K
eeping
gi
t
-
f
ast-import
(
1
): remo
v
e dupli
c
ate '--done' option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John Keeping
Documentation: do
n
't lin
k
to example mail ad
d
r
esses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Keepin
g
r
e
base -i conti
n
ue: don
'
t
skip commits t
h
a
t
only change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree