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 Ke
e
pi
n
g
push: avoid
sugges
t
ing "merging" remo
t
e
c
h
anges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John
K
e
eping
di
f
f
too
l
: f
i
x dir-
d
iff when file do
e
s not e
x
ist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
J
o
h
n Keepi
n
g
m
erge-tree: handle dire
c
tor
y
/em
p
ty
c
onf
l
ict corre
c
t
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn Keeping
t/
M
akefile: remove smoke test targ
e
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
m
e
rge-tree: fix
typo
i
n "both changed
i
dentically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
pin
g
transp
o
rt-hel
p
e
r
:
add '
s
igned-t
a
g
s
' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keeping
tra
n
sport-
h
el
p
er: pa
s
s --s
i
gned-tags
=
warn-strip
t
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-export: add --signed-tags
=
wa
r
n-stri
p
m
o
d
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepin
g
t/test-lib
.
sh
:
fix
T
RASH_DIRECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
J
o
hn Keeping
merge-tree:
d
on't print ent
r
ies that match "lo
c
a
l"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
J
ohn Keeping
g
itremote-helpers(1): clarif
y
refspec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn Keeping
su
b
module: print graph
o
u
t
put ne
x
t to submodule
log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n
Keepi
n
g
diff: all
o
w
unstu
c
k
arguments with -
-
diff-a
l
go
r
it
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keepin
g
git-merge(1): document
d
iff-algorithm optio
n
to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisect: avoid
s
ig
n
e
d
integer overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Keepin
g
diffc
o
re-br
e
ak:
d
on't divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: run
--dir-diff tests with and w
i
t
h
o
ut symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Keeping
t7800: fi
x
test
s
when difft
o
ol uses --no-symlin
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
t7800
:
d
o
n't hide
grep
o
utput
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keep
i
ng
difftool:
don't overwri
t
e modi
f
ied files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keepin
g
t78
0
0: move '--symlinks' specific
t
e
st
to th
e
end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
ohn Keeping
merge-tree: fix typo in m
e
rge
-
t
r
ee
.
c::unreso
l
ved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
J
ohn Keeping
refs
.
c: fix fre
a
d error handlin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
p
ing
entry: fix
f
i
lter look
u
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
h
n
K
eeping
t2
0
03: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
dif
f
tool --dir-diff: symlink all fi
l
es matching
t
he
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
diff
t
ool:
a
voi
d
double slash
e
s in
symlink
t
argets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
git-difftool(1): fix formatting
of --s
y
m
link descript
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
Joh
n
Keepi
n
g
Re
v
ert
"
g
r
a
ph
.
c: mark p
r
iv
a
t
e
fi
l
e
-
scope symbols
a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Makefile: ma
k
e ma
n
dir,
htmldir and inf
o
dir
a
bsolut
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
n
g
rebase -i: res
p
ect core
.
co
m
mentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keepin
g
co
m
b
i
ne-diff
.
c
:
t
each co
m
bined diffs abou
t
line
p
r
efix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n
Keepin
g
diff
.
c: use
diff_line_prefix(
)
where app
l
icable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
di
f
f: add diff_line
_
p
refix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
i
f
f
.
c
:
make c
o
nstant
s
t
r
ing
a
rgu
m
ents
const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
diff: writ
e
prefix to the correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
ohn Keeping
g
r
a
ph: output p
a
dding for merg
e
s
u
bsequen
t
pare
n
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t403
8
: add t
e
st
s
for "diff --
c
c
--raw <tree
s
>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Joh
n
Keeping
builtin/apply
:
tighten
(dis
)
similarity
ind
e
x
parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
m
er
g
et
o
ol
-
-
lib: lis
t
user
configured to
o
l
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-help
e
r
s
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
CodingGuidelines: ad
d
Pyt
h
on coding guideli
n
es
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-remote-testp
y
: fix
p
a
t
h hash
i
ng o
n
P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
mer
g
etool--lib:
d
on't call "exit" in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-difftool: use git-merge
t
o
o
l--lib for "--
t
ool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-m
e
r
getool: don't
h
ardcode 'me
r
ge
t
ool' in sh
o
w_too
l
_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git-merget
o
ol: remo
v
e red
u
ndant assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n Keeping
g
i
t-mergetool: move sh
o
w_tool_h
e
l
p to mergetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git-remote-testpy: call pr
i
nt as a funct
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
git-remote-testpy:
d
on
'
t
do
u
n
buffe
r
e
d
tex
t
I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
pi
n
g
git-remote-testpy:
h
ash bytes explicit
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
svn-f
e
:
all
o
w sv
n
rdump_sim
.
py to run
w
i
t
h Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git_remote_hel
p
ers: use 2to3 if building wit
h
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git_remote_help
e
rs: force
reb
u
ild if python versio
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
J
o
h
n
Keeping
git
-
cvsimp
o
rt
.
txt: cvsps-
2
is
d
eprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keeping
g
i
t-for-each
-
r
e
f
.
txt: 'r
a
w' is a
supported
d
ate for
m
at
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
o
hn Keeping
git_r
e
mote_helpers: fix input w
h
en running
u
nder Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
Jo
h
n Ke
e
ping
git_rem
o
te_h
e
lpers: allow building with Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Ke
e
p
ing
git-svn: te
a
ch
f
i
nd-rev to find near matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
Jo
h
n Keepi
n
g
git-fast-import(1): reor
g
anise options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keepi
n
g
git-fast-impo
r
t
(1):
combine
d
ocumentat
i
on of --[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
g
i
t-
s
hortlog(1)
:
d
o
cument behaviour of zero-
w
id
t
h
w
rap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
Jo
h
n Keeping
git-
f
ast-import(1): re
m
o
ve du
p
l
i
c
ate '--done'
o
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John Keeping
D
o
cument
a
ti
o
n: d
o
n
'
t lin
k
to
e
xample mail addresses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Ke
e
ping
rebase -i con
t
inue: don'
t
skip commi
t
s that only change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree