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
push: avoid suggesting "merging" remote changes
2013-07-07
John
K
ee
p
ing
push: avoid suggesting "merging" remote changes
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-17
J
ohn Ke
e
p
i
ng
difftool: fix dir-
d
if
f
when fil
e
does not exist in
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-07
J
o
hn Keeping
merge-tr
e
e: hand
l
e directo
r
y/em
p
ty conflict
c
orr
e
ctl
y
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
J
o
h
n K
e
eping
t/Makefile: re
m
ove
s
moke tes
t
tar
g
et
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
John K
e
eping
me
r
ge-tree: f
i
x typo in "both c
h
an
g
ed id
e
ntically"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transp
o
rt-helper:
add 'si
g
n
e
d-tags'
c
apability
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
ing
tran
s
port-helper:
pass --signed-t
a
g
s
=warn-strip
t
o
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keepi
n
g
fast-expo
r
t: add --sign
e
d
-
t
ags=warn-str
i
p m
o
d
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/test-li
b
.
sh
:
fix
TRASH_DIREC
T
O
RY han
d
ling
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-08
J
ohn Keeping
merge-tree: don't
prin
t
e
ntries that match "l
o
cal"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-07
Joh
n
Keeping
gitremote-
h
e
lp
e
r
s(1): clarify
refspec behaviour
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eepin
g
submodule
:
p
r
int
graph
o
utp
u
t next
t
o s
u
bmodule log
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eeping
diff: allow unstuc
k
arguments
w
ith --
d
if
f
-algorithm
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
g
it-merge(1):
d
ocum
e
nt diff-a
l
gor
i
thm opt
i
on to merge
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
John Kee
p
ing
bisect:
avoid
signed integer overflow
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
J
ohn Keeping
diffcore-break: don't divide by
zero
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
J
o
h
n
Keeping
t7800: run --dir-
d
iff tests with and
wit
h
out sym
l
i
n
ks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Kee
p
ing
t7800: fix tests when d
i
f
ftool
u
ses --no-symlinks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
epin
g
t7800: don't hide
grep outpu
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
di
f
ftoo
l
: don't ov
e
rwrite
m
odified fi
l
es
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: m
o
ve
'--symlin
k
s
'
s
pe
c
ific
test t
o
the end
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-27
J
o
hn Keeping
merge-tree: fix typ
o
in
m
erge-tr
e
e
.
c::unres
o
lved
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-24
Joh
n
Keeping
refs
.
c: f
i
x
fread error h
a
n
d
ling
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keep
i
ng
e
n
try:
fi
x
f
i
lter lookup
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
t
2
003: mode
r
nize s
t
y
l
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
difftool --dir-di
f
f: s
y
mlink
a
ll f
i
les matching the
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
d
i
ffto
o
l:
a
void
double sl
a
shes in symlink ta
r
gets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
git-
d
ifftool(1):
fix formatting
o
f --symlink description
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-04
John K
e
e
ping
Rever
t
"gr
a
ph
.
c:
m
ark privat
e
file-scope symbol
s
as
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-25
Jo
h
n Keeping
Makefile: make
mand
i
r
,
ht
m
ldi
r
an
d
i
nfodir absolut
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keep
i
ng
rebase -i: r
e
spect core
.
c
om
m
entchar
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
combine-dif
f
.
c:
teac
h
combine
d
diffs about line prefix
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
diff
.
c: use
d
i
f
f_li
n
e_pre
f
ix(
)
where app
l
icable
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
diff: ad
d
d
i
ff_lin
e
_prefix function
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: make constant
st
r
ing arguments
c
o
nst
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eeping
diff: write pre
f
ix
to the correct f
i
le
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-07
John Keep
i
ng
graph: output p
a
ddi
n
g fo
r
m
erge subse
q
uent pare
n
t
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t4038: add tests
for "di
f
f --cc --
r
aw <trees>"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John
K
eeping
bui
l
t
in/apply: tigh
t
en (dis)s
i
m
i
l
arity i
n
dex pars
i
ng
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John Ke
e
ping
m
ergetool--lib: li
s
t u
s
er configured tool
s
in '--tool
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-01
J
o
hn Keeping
Rena
m
e
{
git- =
>
git}remote-help
e
rs
.
txt
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-30
J
oh
n
K
e
eping
C
o
dingGuidelines: add Python coding guidel
i
nes
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-re
m
o
t
e-testpy: fix path
hashing
o
n
Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-28
J
ohn Keeping
me
r
getool-
-
li
b
: don't call
"
exit" in setup_tool
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn
K
eepin
g
git-dif
f
tool: use gi
t
-me
r
getool
-
-lib fo
r
"
--tool-h
e
lp"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
gi
t
-me
r
getool
:
don't hardcode 'm
e
rgetoo
l
' in
s
h
o
w_tool
_
help
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
e
ping
g
it-
m
erg
e
tool: remove
r
e
dundant
a
s
sig
n
ment
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-m
e
rgeto
o
l: move show_t
o
ol_help to mergetool--lib
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n
Keeping
g
i
t
-
r
emote-testpy: call print as a function
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
it-remo
t
e-testpy:
d
o
n
'
t do unbuff
e
red text I/O
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
gi
t
-
remote-testp
y
:
hash bytes
e
x
plicitly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
s
vn-fe: al
l
o
w
svnrdum
p
_sim
.
p
y to run with Py
t
hon 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n
K
ee
p
ing
g
it_r
e
m
o
te_helpe
r
s: use 2to3 if bu
i
l
d
i
ng with Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git_remote_helpe
r
s:
for
c
e rebuild if python version
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-24
J
o
hn Kee
p
ing
git-cvsimport
.
txt: cvsps-2 is depr
e
c
a
te
d
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-22
Jo
h
n Keepi
n
g
git-for-each-ref
.
txt: 'raw' is a sup
p
orted date format
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-21
John
Keeping
git
_
remote_helpers: f
i
x input when running un
d
er Python
3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_remote_helpers: allow building with Py
t
hon 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 nea
r
matches
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fas
t
-
import
(
1
):
re
o
rganise op
t
ions
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fast-i
m
po
r
t(1): combine documentation of
--[no
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
John
K
eeping
g
it-sho
r
t
l
og(1): do
c
ument behaviour of
z
ero-width
wrap
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-08
John Keeping
g
i
t-fa
s
t-import(1): re
m
ove dupl
i
c
a
te '--d
o
ne' op
t
ion
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2012-12-17
John Keepin
g
Documentation: don
'
t lin
k
to
e
x
a
mple
mail addresses
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2012-04-09
John Kee
p
ing
reba
s
e -i continue: don'
t
sk
i
p commi
t
s that
o
nly change
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree