repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
cmd_diff(): rename local variable "list" -> "entry"
2013-05-17
John Keeping
difftoo
l
:
fix dir-diff
w
hen file does not exist i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John K
e
epi
n
g
merge-tree: hand
l
e dire
c
tory/em
p
ty c
o
nflict corre
c
tly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John
Keeping
t/Makefile
:
remove smoke
t
e
s
t targe
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
ohn K
e
eping
merge-tree: fix
t
y
p
o
i
n "both changed i
d
entically
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transport-helper: add
'sig
n
ed-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keeping
trans
p
ort-helper: pass --signed-tag
s
=warn-str
i
p t
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Kee
p
ing
f
ast-e
x
port: ad
d
--
s
igned-t
a
g
s=w
a
rn-strip
m
od
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
/
test-lib
.
s
h: fi
x
TRASH
_
DIRECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
Jo
h
n Keeping
mer
g
e-tree: don't
pri
n
t
en
t
ries that ma
t
ch "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keep
i
ng
g
i
tr
e
mot
e
-hel
p
ers
(
1
): clarif
y
refspec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
K
e
ep
i
n
g
submodule: print gra
p
h out
p
ut next to submo
d
u
l
e
log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Kee
p
ing
diff:
a
llow un
s
tuck a
r
guments with --diff-algo
r
ithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eeping
g
i
t
-
merge(1): docum
e
nt d
i
ff-alg
o
rithm option to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn Keeping
bis
e
ct:
avoid signed
i
nt
e
ger overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
K
e
eping
diffcore-break: don't divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keep
i
ng
t7800: run --dir-d
i
ff tests
with and without symlink
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keep
i
ng
t780
0
:
fix tes
t
s whe
n
diffto
o
l
uses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn
Ke
e
ping
t7800:
don'
t
hide g
r
ep
output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Kee
p
ing
dif
f
t
o
ol: don't ov
e
rwrite modified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepi
n
g
t7800: move
'--symlinks' spec
i
fi
c
test to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John
K
eepi
n
g
merg
e
-tree
:
fix typo i
n
merge-tr
e
e
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c: fix fread er
r
or hand
l
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
entry: fix
filte
r
l
oo
k
up
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
h
n Keeping
t
2
003:
m
od
e
rniz
e
s
t
yle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
ping
difftool
-
-dir-di
f
f: symlin
k
al
l
files matc
h
i
n
g
t
he
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepi
n
g
difftool: a
v
o
id double sla
s
hes in symli
n
k tar
g
ets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
git
-
difftool(
1
): fix
f
orma
t
ting of
-
-
sy
m
link descrip
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John K
e
e
p
i
n
g
Revert "
g
raph
.
c
: mark private file-scope sy
m
bo
l
s as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
M
a
k
efil
e
:
make mandir, htmldir a
n
d in
f
odir
absolu
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
rebas
e
-i: respect
c
ore
.
c
o
mmentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
c
o
mbine-diff
.
c: teach combined diffs abou
t
line
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn K
e
e
p
ing
diff
.
c: use diff_line_prefix() where ap
p
l
icable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
di
f
f
: a
d
d
d
iff_line_prefix functi
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
dif
f
.
c:
make const
a
n
t string arguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eeping
diff
:
w
r
i
t
e prefix
to the correct fi
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
gra
p
h:
output padding f
o
r merge subsequent par
e
nts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
Jo
h
n Keeping
t4038: add tests for "diff -
-
cc
-
-raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John K
e
e
p
in
g
builtin/apply: tighten
(
dis)si
m
i
l
a
r
ity index
p
arsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
Keeping
m
e
rg
e
tool--lib: list
user configured tool
s
in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Rename {git- => git}remote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John K
e
e
p
ing
CodingGuide
l
ines: ad
d
Pyt
h
on coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
John
K
eeping
gi
t
-
remote-te
s
tpy:
f
ix path hashi
n
g on Pyth
o
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Ke
e
p
ing
mergetool--lib: don't ca
l
l
"
exit" in setu
p
_t
o
ol
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Kee
p
ing
git-diff
t
ool: u
s
e gi
t
-mergetool-
-
lib for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
oh
n
Keepin
g
g
it-mergetool: don't
hardco
d
e
'me
r
getool'
i
n show_too
l
_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git-mer
g
e
tool:
r
emove redunda
n
t
assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
e
ping
git
-
m
e
rgetool: move show
_
tool_hel
p
t
o
mergetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote-test
p
y: c
a
ll p
r
int as a f
u
nction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote-testpy: don'
t
do unbuffered
text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
git-remote-testpy: hash by
t
es exp
l
i
citly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
svn-fe: al
l
ow svnrdump_
s
i
m
.
py to
r
un with Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn
K
eep
i
ng
gi
t
_
r
emo
t
e_helpers
:
use 2to3 if
b
uilding wi
t
h Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git_re
m
ote_helpers: force rebui
l
d if p
y
thon
versi
o
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
Jo
h
n Keeping
git-cvsimport
.
tx
t
: cvs
p
s-2 is deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
J
oh
n
K
eeping
g
it-for-ea
c
h-ref
.
txt:
'
raw
'
is
a
s
upported
date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John
Keepin
g
g
it
_
remote_helpers
:
fix input when run
n
ing under
P
ython
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keep
i
ng
git_remote_helpers:
a
llo
w
buildi
n
g with Pyt
h
on
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keeping
git-svn: teach find-re
v
to find n
e
ar
m
atches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
ohn Keeping
git-f
a
st-import(1): r
e
or
g
anise options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
Jo
h
n Keepi
n
g
g
it-fast-impo
r
t(1):
c
o
mbine docum
e
ntation o
f
--[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Kee
p
ing
gi
t
-shortlog(1):
document behaviour of zero-width
w
r
ap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keeping
git-fas
t
-import(1): remove duplic
a
t
e
'--
d
one
'
o
ption
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John K
e
eping
Docume
n
tation:
d
on't
l
ink to
e
x
a
m
p
le
m
ai
l
add
r
ess
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Keeping
rebase -i cont
i
nue
:
don't skip commits that only change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree