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
CodingGuidelines: style for multi-line comments
2013-10-03
J
ohn
K
eeping
Documentation/Makefile: make A
s
ciiDoc dblat
e
x
d
i
r confi
g
ur
a
ble
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John K
e
epi
n
g
merge-recu
r
siv
e
:
fix p
a
rsing of "diff-algorithm" o
p
tio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
n Keeping
g
i
t_
r
e
m
ote_
h
elpers: rem
o
ve li
t
tle use
d
Python lib
r
ary
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John
K
eepin
g
rev-pars
e
(1
)
: logi
c
a
l
ly
g
roup op
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John
Keeping
rev-parse: remov
e
restrictions on s
o
me
o
pti
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
J
ohn Keeping
pul
l
: chan
g
e the descriptio
n
to "integrate" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keep
i
ng
p
u
sh: avoid suggesting "merging" remo
t
e c
h
anges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
o
h
n
Keeping
git
-
c
onfig(1): clarify precedence of
m
ultiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Ke
e
ping
git
-
c
o
nfig: update doc
for --get with multi
p
le
value
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
c
o
mpletion: lea
r
n about --m
a
n-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Jo
h
n Keeping
c
omp
l
eti
o
n: handle u
n
stuck
f
orm o
f
base g
i
t options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Ke
e
ping
fast-import:
a
l
lo
w
mov
i
ng the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n
Kee
p
ing
fast-import: all
o
w ls
or filecopy of the
r
oot
t
ree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-
i
m
p
ort: se
t
valid mode on
root tree in "
l
s"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keep
i
ng
t9300:
document fast-import empty
path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keeping
submodule: dr
o
p th
e
top-level
r
equ
i
rement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Kee
p
ing
rev-par
s
e: add --p
r
efix opti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Kee
p
i
n
g
submodul
e
:
show ful
l
p
a
th
in error message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t740
3
:
add m
i
ssing &&
c
haining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keeping
t7403: m
o
d
ernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
t740
1
:
m
ake indentation consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn
K
eeping
mergetool--l
i
b:
refactor {diff,merge}_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
ee
p
i
ng
Document
a
tion/
M
akefile:
mo
v
e inf
o
dir to be wit
h
other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Documentatio
n
/Make
f
ile: f
i
x spa
c
es aroun
d
assignm
e
nts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
a
dd--i
n
teractive:
respect diff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
J
o
hn K
e
eping
git-gui:
fix
file
n
a
me hand
l
ing with non-empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
J
oh
n
Kee
p
ing
f
etch: d
o
n't
try t
o
update un
f
e
t
ched tra
c
kin
g
refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John K
e
eping
d
i
fftool: fix dir-diff when file does not exist i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keepi
n
g
merg
e
-
t
r
ee: h
a
ndle directory/empty
c
onflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John
Keeping
t/Ma
k
efile: do
n
't define TEST_RES
U
LTS_DIREC
T
ORY recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John
K
e
eping
contrib/subtre
e
: don't delete r
e
m
o
t
e
bran
c
hes if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test output: respect $
T
EST_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John
Keepi
n
g
t/Make
f
ile: remove smoke
test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merge-tre
e
:
f
i
x
typ
o
in "both changed
i
denti
c
a
lly"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
J
o
hn
Keeping
t/Makefile
:
fi
x
result handling with
TEST_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n
K
eeping
transport-helper: add '
s
i
g
ned-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
tran
s
port-helper
:
pass --
s
igned-tags=warn-s
t
rip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-e
x
p
ort:
a
dd --signed-tags=warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/test-lib
.
sh: fix TRASH_DIRECTORY handl
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John K
e
eping
mer
g
e-tree: don't print entries that m
a
tch "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John
K
eeping
gitremote-h
e
lpers
(
1)
:
c
larify refspec behav
i
our
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Ke
e
ping
submodule:
print graph out
p
ut ne
x
t
to
s
ubmodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
Ke
e
ping
diff: allow unst
u
ck arguments with --diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
g
i
t-merge(1): docum
e
nt diff-a
l
g
orit
h
m option to merg
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keepi
n
g
bisect: avoid signed integer overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
ohn Kee
p
ing
di
f
fcore-break: don't d
i
vide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t7800: run
--dir-diff tests with
and without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn
Kee
p
ing
t7800:
fix te
s
ts when di
f
ftool us
e
s
--n
o
-symlin
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepin
g
t7800:
don't hide
gre
p
o
utp
u
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
epi
n
g
difftool:
d
o
n
't overwrite m
o
d
i
fie
d
files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
t7800: m
o
ve '--
s
y
m
li
n
k
s
' speci
f
ic test to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
m
e
rge-tr
e
e
: fix typo i
n
merge-tree
.
c::
u
nresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
J
o
h
n
K
eeping
r
e
fs
.
c: fix fread error
h
andling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entry:
fix fi
l
ter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Ke
e
ping
t2003:
mode
r
nize s
t
y
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
di
f
ftool --dir-diff: sy
m
link all file
s
matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
d
i
f
ftoo
l
: avoi
d
double slashes in symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn
K
e
e
ping
g
it-
d
i
f
ftool(1):
f
ix form
a
tting of --s
y
mlink
d
e
s
criptio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
Joh
n
Keeping
Revert "graph
.
c: mark priva
t
e file-sco
p
e
s
y
m
bols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John K
e
eping
M
a
kefile: make mandir, h
t
ml
d
ir and infodir abs
o
lu
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebase -i
:
respect
c
ore
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
pin
g
co
m
bine-diff
.
c: teach c
o
mbined diffs abo
u
t line pr
e
fix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
i
ff
.
c
:
use di
f
f_li
n
e_
p
ref
i
x
(
)
where applica
b
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
iff:
a
dd dif
f
_line_prefix fu
n
ction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
oh
n
Kee
p
ing
diff
.
c: ma
k
e constant stri
n
g argument
s
c
o
nst
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
diff: wr
i
te prefix to
the c
o
rre
c
t
f
ile
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
oh
n
Keepi
n
g
gr
a
ph: output pad
d
i
ng for merge su
b
sequ
e
nt
parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Kee
p
in
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
pply: ti
g
h
te
n
(d
i
s
)similarity index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n Keeping
mergeto
o
l
-
-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}remo
t
e-helpers
.
t
x
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John K
e
eping
CodingGuidelines: add Pytho
n
coding guideli
n
es
commit
|
commitdiff
|
tree
2013-01-28
J
o
hn
K
eeping
git-remote-te
s
tpy: fix
p
ath ha
s
hing
on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
Jo
h
n
K
eepi
n
g
mergetool--
l
i
b: don't call "exi
t
" in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
eping
git-difftool: use git-mer
g
etool--lib for "
-
-to
o
l-h
e
lp"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git-mergetool: do
n
't
h
ar
d
code
'
mergetool' in show_too
l
_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergeto
o
l: remove redundant a
s
signment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
e
p
ing
git-me
r
getool: m
o
ve show_tool_hel
p
to mer
g
etool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote-testp
y
: call
p
rint as a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remo
t
e-
t
estpy: don
'
t
d
o unbuffere
d
t
e
x
t
I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote-tes
t
p
y:
h
ash bytes
e
x
p
li
c
i
tly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
svn-
f
e: al
l
o
w svnrdump_s
i
m
.
py to run
w
ith Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
g
it_remote_helpers: use 2to3 if bui
l
ding w
i
th
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_remote_he
l
pers: forc
e
re
b
uild if
p
ytho
n
version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John
Ke
e
ping
git-cvsimport
.
txt: cvsps-2
is de
p
re
c
ated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John
K
eepin
g
git-
f
or
-
each-ref
.
t
xt: 'raw' is a su
p
ported
d
a
te
form
a
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
ohn Keeping
git_remo
t
e_helpers: fix input
when running under
P
yt
h
on 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John K
e
ep
i
ng
git_remote_help
e
r
s: allow b
u
ilding w
i
th Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
J
o
h
n
Keeping
git
-
svn: t
e
ach find-rev t
o
find n
e
ar
matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
gi
t
-fast-i
m
port(
1
)
:
reorga
n
ise optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John
K
e
e
ping
git-
f
ast-import(1): com
b
ine documentation of -
-
[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
oh
n
Keeping
git-shortlog
(
1): document
b
ehaviour of zero-widt
h
wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keeping
git-fast-import(1): remove duplic
a
t
e '--done' op
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John Ke
e
pin
g
Documentat
i
o
n
: don't lin
k
to exampl
e
mail addres
s
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Keepi
n
g
rebase -i con
t
in
u
e:
d
on
'
t skip comm
i
ts th
a
t only change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree