repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool: fix dir-diff when file does not exist in working tree
2013-05-17
John Keeping
d
i
fftool: fix dir-
d
iff when f
i
le doe
s
not
exist in
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-07
J
o
hn Keeping
m
e
r
g
e-t
r
ee: handle
d
irectory/empty conflict correctly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t
/
Makefile: remove smoke test
t
argets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn Kee
p
ing
m
erge-
t
ree: fix typo in "both changed
identic
a
lly"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John
Keeping
transpor
t
-
h
elper:
add 'sig
n
ed-t
a
gs' capab
i
lity
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
eping
transport
-
he
l
per: p
a
s
s --sig
n
e
d-tags=warn-s
t
ri
p
to
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keepin
g
fast-export: add --signe
d
-tags=wa
r
n-strip mode
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/
t
est-lib
.
sh: fix T
R
ASH_
D
IR
E
C
T
ORY handlin
g
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-08
Jo
h
n Keeping
merge
-
tree:
d
on'
t
print
ent
r
ies
t
hat
m
at
c
h "
l
o
cal"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitre
m
ote-he
l
pers(1)
:
clarify refspec beh
a
viour
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
submo
d
u
l
e: p
r
int graph output
n
ex
t
to submodu
l
e log
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John Keep
i
n
g
d
i
ff: al
l
ow unstuc
k
argume
n
t
s
with --diff-algori
t
h
m
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n Keeping
git-merge(1)
:
document
d
i
f
f-alg
o
rithm o
p
tion to merge
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
J
ohn Keepi
n
g
bisect: avoid sig
n
ed integer overf
l
ow
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
diffcore
-
break: don't divide by zero
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keepin
g
t7800: run
-
-dir-diff tests with and wit
h
ou
t
sy
m
links
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
t7800: f
i
x tests when
difftool uses --no-symli
n
k
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800:
don't hide
gre
p
output
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
epin
g
d
ifftool: don't
o
verwrite modified files
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keep
i
ng
t
7
800: mo
v
e '--sym
l
inks' specific test t
o
the end
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-27
John Ke
e
ping
merge-tr
e
e: fix
t
ypo in
m
erg
e
-tre
e
.
c::
u
nresolved
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-24
Joh
n
K
e
eping
refs
.
c: fix fread
e
rro
r
handling
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eeping
ent
r
y: fix filter lo
o
kup
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keepin
g
t2003: modernize style
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eeping
difftool -
-
dir-diff: symlink
all f
i
les matching the
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
diff
t
o
ol: avoid do
u
b
le slash
e
s in symli
n
k targets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Ke
e
ping
git-difftool(1): f
i
x form
a
t
t
ing of --symlink de
s
cri
p
tion
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Rev
e
rt "graph
.
c: mark private
f
ile-scope symbols as
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-25
J
o
h
n
K
e
eping
Makefile: make mandir, htmld
i
r and infodir ab
s
olu
t
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebas
e
-i
:
respect core
.
comm
e
ntchar
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
com
b
i
ne-
d
i
ff
.
c: te
a
ch comb
i
ne
d
diffs about li
n
e prefix
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: use diff_line_pref
i
x() where
a
pplicabl
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: add diff_line_prefix
function
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John
Keep
i
ng
d
iff
.
c
: make con
s
tant str
i
n
g
arguments
c
onst
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
diff: write prefi
x
t
o
the
c
orr
e
ct file
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-07
John
K
eepin
g
graph:
o
utput padding for merge
s
ubsequen
t
paren
t
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-05
J
o
h
n Ke
e
ping
t
4
038: add tests for "di
f
f
--cc --raw <trees>"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John
Keeping
buil
t
in/app
l
y: tighten (dis)similarity in
d
ex parsing
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
J
ohn K
e
e
ping
mergetool--lib
:
list user configured
t
o
ols in '--tool
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-01
John
Keeping
Rename {git- =>
git}remote-helpers
.
txt
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-30
John Ke
e
ping
Coding
G
uideline
s
:
add Python coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
J
o
hn
K
eeping
git
-
r
e
m
ote-
t
estpy: fix path ha
s
hing
on Pyt
h
on 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-28
John Kee
p
ing
mergetoo
l
-
-
lib: don't call "exit" in setup_to
o
l
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n Keeping
git
-
diffto
o
l: use
g
it-
m
ergetool
-
-lib for "-
-
too
l
-help"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
git-mergeto
o
l
:
do
n
't
h
ardcode 'mergetool'
in sh
o
w_tool_
h
el
p
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git-merge
t
ool: remove
r
edun
d
a
nt assignment
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
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
K
eeping
g
i
t-remo
t
e-testpy: call print as a
f
unc
t
i
on
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
n
g
git-remote-te
s
t
p
y: don't do
unb
u
ffered tex
t
I/O
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n
Keeping
g
i
t-re
m
ote-testpy: ha
s
h by
t
es explicitly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Ke
e
ping
s
v
n-f
e
: allow sv
n
rdump_sim
.
py to run wit
h
Pyth
o
n 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_remote_helpers: use 2to3 if buil
d
ing with
Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git_
r
emote_helpers: force rebuild
i
f
p
ython version
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-24
J
o
hn K
e
eping
git-
c
vsimport
.
txt: cvs
p
s-2 is deprecated
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-22
J
ohn Ke
e
ping
git-for-each-ref
.
t
x
t: 'raw' is a
s
uppor
t
e
d date form
a
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-21
John K
e
e
p
ing
g
i
t_remote_helpers:
fix inpu
t
when
r
unni
n
g u
n
der
Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
gi
t
_remote_helper
s
: all
o
w bui
l
ding wit
h
Pytho
n
3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-17
John Keeping
git-svn: teach fin
d
-rev to fin
d
near matches
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
John
K
ee
p
ing
git-fast-import(1): reorganise
o
ptions
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
Joh
n
Ke
e
ping
git-fast-impo
r
t(1)
:
combine documentation of
-
-[
n
o
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
John
Kee
p
i
ng
git-shortl
o
g(1
)
: documen
t
b
e
haviour of zero-widt
h
wrap
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-08
John K
e
eping
git-fast-i
m
port(1): remove dupli
c
a
te '--done' option
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2012-12-17
John
Keeping
Documentation: do
n
't
link
t
o exa
m
ple m
a
il
a
d
d
resses
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2012-04-09
John K
e
ep
i
ng
rebase -i co
n
t
i
nue: don't skip
c
omm
i
ts that only
c
ha
n
g
e
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree