repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rebase -i: use a better reflog message
2013-05-17
John Keeping
d
ifftool:
f
ix
d
ir-diff when file does not exis
t
in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John
K
eeping
merg
e
-tree: handle
d
irec
t
ory/empty conflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John
K
eeping
t/Makefi
l
e: remo
v
e smoke test
t
ar
g
ets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Jo
h
n Keeping
merge-tree
:
fix typo in "bot
h
cha
n
ged ident
i
cally"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
tra
n
sport-
h
elper: ad
d
'
s
igned-
t
ags' ca
p
abil
i
ty
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
ep
i
ng
tra
n
sport-helper: pass --signed-tags=warn-strip
to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-export: add --sign
e
d-tags=warn
-
strip mo
d
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Kee
p
ing
t/test-lib
.
sh: fix T
R
ASH_D
I
RECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-tree:
d
on't print en
t
r
ies that match
"l
o
cal"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Kee
p
ing
gitremote-helper
s
(1): clarify
r
efsp
e
c behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
subm
o
d
ule: pr
i
nt gra
p
h
o
utp
u
t next to submodule l
o
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
K
e
eping
diff:
allow unstuck argum
e
nts w
i
th --diff
-
a
l
gorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
K
e
e
p
ing
g
it-merge(
1
): document diff-algorithm
option to
m
erg
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisect: avoid signed integer over
f
low
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
d
i
ffcor
e
-b
r
eak: don't divide by
z
ero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn K
e
e
p
ing
t7800
:
run --dir-diff tests w
i
th
and without
s
ymlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Kee
p
in
g
t7800
:
fix tests when difft
o
ol uses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eeping
t7800:
d
o
n't
h
ide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Ke
e
ping
difft
o
ol: don't overwrite modif
i
e
d
f
iles
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t
7
800: move '--syml
i
n
k
s'
specific test to the
e
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John
K
e
eping
merge-tr
e
e: fix typo in merg
e
-tr
e
e
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John
Keepin
g
ref
s
.
c: fi
x
f
r
ead er
r
or
h
a
ndling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Keeping
entry: f
i
x
f
ilter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2003: modernize
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n
Kee
p
ing
difftool --dir-diff: symlink
a
ll f
i
les matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftoo
l
: avoid
d
ouble slash
e
s in sym
l
in
k
t
a
r
g
e
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-difft
o
ol(1): fix formatti
n
g o
f
--symlink
d
escri
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John
K
eeping
Revert "g
r
aph
.
c:
m
ark private fil
e
-
scope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
ohn Keeping
Make
f
ile: m
a
ke man
d
ir, htmldir and infodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
r
ebase -i: respect
c
o
r
e
.
commentch
a
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
combine-diff
.
c: teach combined diffs abo
u
t li
n
e prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
d
iff
.
c:
use
d
iff_line_pre
f
ix() where applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n
Keeping
dif
f
: add d
i
ff_line_pref
i
x fu
n
ction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
oh
n
Ke
e
p
i
ng
diff
.
c: make constant string arguments con
s
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: write prefix
to the correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
Joh
n
Keeping
graph: output pad
d
ing for me
r
ge subsequen
t
parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t
4038: add tests f
o
r "d
i
ff --cc --raw <trees>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
hn Keeping
built
i
n/apply: tighten (dis)similar
i
ty index p
a
r
s
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
K
eeping
mergetool--lib: list u
s
er configured tools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
ohn Keeping
Rename
{gi
t
-
=
> git}
r
e
m
ote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John
Keep
i
ng
Codi
n
gGuideline
s
: add Python coding guide
l
ines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-re
m
ote-testpy: fix path
hashing on Py
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
Jo
h
n Ke
e
ping
merg
e
tool--lib: don't call "exit" in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-
d
ifftool: use git-
m
ergetool--lib for "--tool-he
l
p"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git-m
e
r
getool: don't hardcod
e
'mergeto
o
l
' in show_to
o
l_hel
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n
Ke
e
ping
git
-
mer
g
eto
o
l: remove redund
a
nt as
s
ignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergetool: m
o
v
e s
h
ow_tool_help to me
r
getool--li
b
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
it-rem
o
te-testpy: ca
l
l
print as a
f
unction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git-remote-testpy: don't do unbuf
f
ered text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keep
i
ng
git-remote-te
s
tpy: hash byte
s
exp
l
icitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
e
p
i
ng
svn-fe: allow svn
r
dump_sim
.
p
y
to run with Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
K
e
eping
git_remot
e
_helper
s
: use 2to3 if build
i
ng with
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t_remote_helpers: forc
e
r
ebuild if python version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John K
e
e
p
i
n
g
git-cvsimport
.
txt: cvsps-2
is deprec
a
ted
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
Jo
h
n
K
eeping
git
-
for-ea
c
h-ref
.
txt:
'r
a
w
' is a
s
upp
o
rted date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
Joh
n
Keeping
g
i
t
_remote_
h
elpers: fi
x
input when
runn
i
ng under Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John
K
eeping
git_remote_help
e
rs:
a
llow buildin
g
wit
h
P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keeping
git-s
v
n: teach fin
d
-rev to find ne
a
r matc
h
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keepi
n
g
g
i
t
-fa
s
t-import(1):
r
e
o
r
g
a
nise
o
ptions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
Joh
n
Keeping
git-fast-i
m
p
ort(1): co
m
bine doc
u
mentation of
--
[
no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-s
h
o
r
t
log(
1
)
: document behaviour
o
f
z
ero-w
i
d
th wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
Joh
n
Keeping
git-fast-imp
o
r
t
(
1
):
r
e
m
ove duplic
a
te '--
d
o
ne' option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John
Keepin
g
Documentation: don't link to example mail
addresse
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Keeping
r
eb
a
s
e
-i continue: don't
s
k
i
p commits t
h
at only change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree