repo.or.cz
/
git
/
git-svn.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
Kee
p
ing
merge
-
tre
e
: handle di
r
ec
t
ory/empty co
n
fli
c
t
c
orrectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
h
n
Keeping
t/Mak
e
file: remove smok
e
t
e
st tar
g
ets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Joh
n
Keepin
g
m
erge-tree: fix typo
i
n
"both changed identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
ing
tr
a
nspor
t
-
h
e
lper: add 'signed-t
a
gs' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
tr
a
nsport
-
help
e
r: pass -
-
signed
-
tags=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
ng
fa
s
t
-
export: add
--signed-tags=warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
ng
t/test-lib
.
sh: f
i
x TRAS
H
_DIRECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John
Keeping
merge-tree: don't pri
n
t
ent
r
ie
s
that match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Kee
p
ing
gitremote-helpers
(
1): clar
i
fy refs
p
ec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
submodule: pr
i
nt g
r
ap
h
o
utput next
t
o submod
u
le l
o
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eepi
n
g
diff: allo
w
uns
t
uck arguments with
-
-
d
iff-algo
r
ithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
git-merge(1):
do
c
ument diff
-
algorithm option t
o
m
erge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keepin
g
bisect: a
v
oid signed integer
overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Keep
i
ng
diffcore-b
r
eak: don
'
t divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepi
n
g
t7800: run --d
i
r-
d
i
f
f
tests with and with
o
ut symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n
K
eepi
n
g
t
7
8
0
0
:
fix tests when di
f
f
t
ool uses --n
o
-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keepi
n
g
t7800: don't hide grep outp
u
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keeping
d
ifftoo
l
: don't overwrite modified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Keeping
t7
8
00: move
'
--symlin
k
s' specific
t
e
s
t to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John
Kee
p
i
ng
merge-tree:
f
i
x
typo i
n
merge-t
r
ee
.
c::unr
e
solve
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c: fix f
r
ead err
o
r
handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
en
t
ry: fix f
i
lter
look
u
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t
2003: mo
d
ernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
difftool --dir-d
i
ff
:
syml
i
n
k all f
i
les match
i
ng the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool: avoid double s
l
ashes in
symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
g
i
t-difftool(1)
:
fi
x
formatting of
-
-
symlink d
e
scription
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keep
i
ng
R
e
v
ert "graph
.
c: mark
private file-scope symbols
a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
M
akefi
l
e
: mak
e
mandir, html
d
ir and infodi
r
absolu
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
K
e
eping
r
e
base -i: respect
cor
e
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
c
ombine-diff
.
c: teach com
b
i
ned
diffs about line pr
e
fix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
in
g
diff
.
c: u
s
e diff_line_
p
refix() where applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keepin
g
d
iff: add diff_line_
p
refix
functi
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
diff
.
c: m
a
ke c
o
nstant string arg
u
ments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
iff
:
w
r
ite pr
e
fix to the
c
orrect file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
g
r
a
ph: output
p
addi
n
g
f
or merge subseq
u
ent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John
Keepin
g
t4038:
add tests for "diff -
-
cc --raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin
/
a
p
ply:
t
ighten (dis)similari
t
y index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
Keepin
g
m
e
rget
o
o
l--l
i
b
:
list user c
o
n
f
igured t
o
ols
i
n
'--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Ke
e
p
i
ng
Rena
m
e {git- =>
g
i
t}remo
t
e-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Ke
e
pi
n
g
CodingGui
d
e
lines: a
d
d Pyth
o
n
codi
n
g guidelines
commit
|
commitdiff
|
tree
2013-01-28
J
o
h
n Keeping
g
it-remote-testpy: f
i
x path h
a
shi
n
g
on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John
Ke
e
p
i
ng
m
e
r
getoo
l
--lib: don
'
t call
"exit" in setup_too
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-
d
ifftool: u
s
e git-
m
erg
e
t
o
o
l--l
i
b for "--tool-
h
elp"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-merg
e
too
l
: don
'
t
har
d
code 'mergeto
o
l' in show_to
o
l
_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
git-
m
ergetoo
l
: re
m
ove
r
ed
u
ndan
t
ass
i
g
n
ment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergetool: move show_tool_help t
o
mergetool-
-
l
i
b
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
ep
i
ng
git-remote-testpy: c
a
ll print as a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-
r
emote-testpy: don
'
t
do unbuffered text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keep
i
ng
git-r
e
mote
-
t
estpy: hash byt
e
s ex
p
li
c
it
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
s
v
n-fe: allow svnrd
u
mp_
s
im
.
py to run with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git_remote_helpers:
use 2to3 if building w
i
th Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
git_re
m
o
t
e
_helpers: f
o
r
ce reb
u
ild
i
f pyt
h
on version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keeping
g
it-cvsimport
.
t
xt: c
v
sps-2 is deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
Jo
h
n Keeping
git-
f
or-
e
ach-ref
.
tx
t
: '
r
aw' is a supp
o
rted date
f
ormat
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John
K
e
e
ping
gi
t
_remote
_
h
e
l
p
ers: f
i
x input w
h
en runn
i
ng under Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
g
it_r
e
mote_helpers: allow buildin
g
w
i
t
h Pyt
h
on 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
Joh
n
Keeping
git-s
v
n:
t
each
find-rev to find near matc
h
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Ke
e
ping
gi
t
-fast-import(1): re
o
rganise options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
o
hn K
e
eping
g
i
t-fast-import(1): comb
i
ne document
a
tion of --[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
o
hn Keeping
git-sho
r
tlog(1
)
: document behaviour
of
zero-width wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keeping
git-fa
s
t-import(1)
:
remove d
u
plicate '--don
e
' option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John
Keeping
Docum
e
ntation: don't link to example mail ad
d
resses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
Joh
n
Keeping
rebase
-
i continue: do
n
'
t
s
kip co
m
mi
t
s that only change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree