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
pull: change the description to "integrate" changes
2013-07-08
J
ohn
K
e
eping
p
u
l
l:
c
hange the
d
escription to "i
n
tegrate" c
h
anges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keepin
g
pu
s
h:
a
void suggesting "m
e
rgin
g
"
remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Kee
p
ing
difftoo
l
: fix dir-d
i
ff when fi
l
e does
not exist
i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
Joh
n
Keeping
merge-tr
e
e:
h
andle directory/empt
y
confl
i
ct correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
ohn Ke
e
ping
t/Makefil
e
:
r
e
mo
v
e smoke test
target
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keepi
n
g
m
erge-tree
:
fix typo in "both changed identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keeping
t
r
ansport-h
e
lper: add 'signed-tags' capabi
l
i
t
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Ke
e
pin
g
trans
p
ort-help
e
r:
pass --s
i
gned-tags=warn-stri
p
to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
f
a
st-export: add --signed-tag
s
=warn-
s
tr
i
p mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
Keepin
g
t/te
s
t-lib
.
sh:
f
ix TRASH
_
DIRECT
O
R
Y handl
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
m
e
rge-tree: d
o
n't print entries
t
hat match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitremote
-
helpers(1): clar
i
fy
r
efsp
e
c behav
i
o
ur
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Ke
e
ping
s
u
bmo
d
ule: print
g
raph output next to sub
m
odule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keepi
n
g
d
iff: allow u
n
stuck
a
r
g
uments with --
d
iff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keep
i
ng
git-merge(1): document
diff-algorithm
o
ption to me
r
ge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
K
eepi
n
g
bisect:
a
void
s
i
g
ned int
e
ger overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
ohn Kee
p
ing
di
f
f
core-b
r
eak: don't di
v
i
d
e
by zer
o
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: run --dir-dif
f
tests with an
d
without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t7
8
0
0
:
fix te
s
t
s when difftool uses --
n
o-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keeping
t780
0
: don't hide grep out
p
u
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
difftool: don't o
v
erwrite modified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t
780
0
: move '
-
-symlinks'
s
p
e
cific test to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
ohn Keeping
mer
g
e-tree: fix typo in merge-tre
e
.
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
h
a
ndli
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
ent
r
y: fix fil
t
er
lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Keeping
t2003: modern
i
ze
s
tyle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
pi
n
g
difftool --dir-diff:
symlink all fi
l
es matchi
n
g the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
di
f
ftoo
l
: avoid doubl
e
slashes in s
y
m
link
targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keep
i
ng
git-diff
t
oo
l
(
1): fix formattin
g
o
f
--syml
i
nk descriptio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keep
i
ng
Revert
"
graph
.
c: mark pr
i
vate fi
l
e-s
c
ope s
y
mbo
l
s
a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Makefile: make
ma
n
d
ir, htmldir a
n
d infodir abs
o
lute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
rebase
-i: r
e
s
pect
c
ore
.
comment
c
har
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
combine-diff
.
c: teach combined diffs a
b
o
ut li
n
e prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
diff
.
c: use
diff_line_prefix() where applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
i
ff: add d
i
ff_l
i
ne_prefix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
diff
.
c: make constant stri
n
g argumen
t
s cons
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
diff: write
p
re
f
ix to the
c
o
rrect file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
Jo
h
n Keeping
graph: output
padding for merge
s
ubse
q
uent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John
K
eeping
t403
8
: add
t
est
s
for "diff --cc --raw <trees
>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
bu
i
ltin/a
p
ply: tighten (dis)sim
i
larity index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
hn Keeping
merg
e
tool--lib: list
u
ser c
o
nfigur
e
d t
o
ols in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keepi
n
g
Renam
e
{git- =>
g
it}r
e
m
o
te-he
l
pers
.
tx
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
ohn
Keeping
Codi
n
gGuide
l
ines: add
Pyth
o
n
c
o
ding guidelines
commit
|
commitdiff
|
tree
2013-01-28
John
Ke
e
ping
git-r
e
mote-tes
t
py: fix p
a
th hashin
g
on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
Jo
h
n Keep
i
ng
mergetool--lib: don't call "exit"
i
n
setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
it-difftool:
u
se git-mergetool--lib
for
"--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
n
g
git-me
r
g
etool: don't hardcode 'mergetoo
l
' in show_too
l
_
h
elp
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergetool: re
m
o
v
e redundant a
s
signmen
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
git-mergetool: move show_tool_help to mergetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
-remote-t
e
st
p
y: cal
l
print as a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keepin
g
git-remote-t
e
stpy: don't do
un
b
uffer
e
d te
x
t I/
O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n K
e
eping
g
i
t
-rem
o
te-testpy: h
a
s
h
bytes ex
p
l
i
citly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n
Keeping
s
v
n-
f
e: allow svnrdump_sim
.
p
y
to
r
un wi
t
h
Pyth
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
_remote_helpers: use
2
to3
if building
w
ith Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
g
i
t
_
remote_
h
e
lpe
r
s
:
force re
b
u
ild if python vers
i
on
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keepi
n
g
git-cvsimport
.
txt: cvsps-2 is
depreca
t
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John
K
eepin
g
git
-
for-each-ref
.
txt: 'raw' is a supported dat
e
f
o
r
mat
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Ke
e
pi
n
g
git_rem
o
t
e
_helpers: fix
i
n
put when running under Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
Jo
h
n Keeping
git_remote_h
e
lpers: allow buil
d
ing
w
ith Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
Jo
h
n
Keeping
git-svn: teach
f
i
n
d-rev to find near m
a
tches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Kee
p
ing
git-
f
a
st-import(1): reo
r
ga
n
ise o
p
tions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git
-
f
a
st-impor
t
(1): combin
e
documentat
i
on o
f
--[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
o
hn Ke
e
ping
git-sho
r
tlog(1)
:
d
ocu
m
ent beha
v
iour of zero-width wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keepin
g
g
i
t-fas
t
-import(1): remove duplicate '--d
o
n
e
' optio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John Keepi
n
g
Documen
t
ation
:
don't lin
k
to example mail addresse
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
Joh
n
K
e
e
p
in
g
re
b
ase -i continue
:
do
n
't skip comm
i
ts that only change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree