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
Merge branch 'rr/zsh-color-prompt'
2013-05-28
John
K
eeping
f
etch: don't try to update unfetched tracking
refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
d
i
fftool: fix dir
-
diff when
file
d
oes not exist
i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John
Keeping
mer
g
e-t
r
ee:
h
a
nd
l
e
d
irectory/empt
y
c
onfli
c
t correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John K
e
eping
t/Makefile: do
n
'
t
define TEST_RESULTS_D
I
R
ECTORY recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Kee
p
ing
con
t
r
i
b/s
u
btree: do
n
't
d
e
le
t
e remote branches if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
Joh
n
Keepi
n
g
tes
t
output: respect $TEST
_
OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefile: re
m
ov
e
sm
o
ke
t
est
tar
g
et
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John K
e
eping
merge-t
r
ee: fix ty
p
o in "
b
oth chan
g
ed id
e
ntically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
Jo
h
n
K
eeping
t
/
Makef
i
le: fix result
ha
n
dl
i
ng with
T
EST_OUTPUT_DIRECT
O
RY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
Kee
p
ing
tra
n
sp
o
rt-helper: add '
s
igned-tags' cap
a
bility
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
ng
transp
o
rt-helper: pass
-
-signed-tags=war
n
-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-export: add --signed-tags=warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/
t
e
s
t-lib
.
sh: fix
TRAS
H
_DIRECTORY
handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John
Keepi
n
g
merge-t
r
ee: don't print entries that match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitrem
o
te-helpe
r
s(1): c
l
arify refspec behaviou
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
ee
p
i
ng
subm
o
d
u
le
:
pr
i
nt g
r
a
p
h output next to su
b
m
o
dule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
d
i
ff: allow unstuck arg
u
ments with --diff
-
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Kee
p
ing
git-merge
(
1): d
o
cument diff-alg
o
rit
h
m optio
n
to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
h
n
Ke
e
p
i
ng
bis
e
ct: avoid signed
integer overfl
o
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
Keeping
diffc
o
re-break: do
n
'
t
di
v
i
d
e 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 without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eeping
t7800: fix tests w
h
en difftool uses --
n
o-symli
n
ks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800:
don't hide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keeping
dif
f
tool: d
o
n't overwrit
e
modified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t780
0
: move '--symlinks' spe
c
i
fic tes
t
to t
h
e
en
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
me
r
ge
-
tre
e
: fix
t
ypo in merge-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
r
e
fs
.
c: fix
f
r
ead
e
rror handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
entry
:
fix fi
l
ter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepi
n
g
t
2003: mo
d
ernize
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool
-
-dir-
d
i
f
f: symli
n
k all
fil
e
s matchi
n
g t
h
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keepi
n
g
difftool: avoid doubl
e
slashes
i
n
syml
i
nk
targe
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
git-difftool(1): fix form
a
tting
of
-
-s
y
mlink desc
r
iption
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Rev
e
rt "gra
p
h
.
c: mark p
r
ivate
f
ile-
s
cope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
ohn Ke
e
p
i
ng
Makefile: m
a
ke
m
andir, htmldir and infod
i
r absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
r
ebase -i
:
respe
c
t
core
.
commentc
h
ar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
comb
i
ne-diff
.
c
: t
e
ach combi
n
ed diffs
a
bo
u
t line p
r
efix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
e
ping
diff
.
c:
use dif
f
_
l
i
ne_pr
e
f
ix()
w
here appli
c
able
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Ke
e
ping
diff: a
d
d
d
iff_line_
p
r
e
fix fu
n
c
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
e
e
ping
diff
.
c: mak
e
c
o
nstant
s
tring
argument
s
const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
diff: writ
e
prefix to the co
r
r
e
ct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keepi
n
g
grap
h
: output padding for merge subsequ
e
n
t
p
a
rents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John
K
eeping
t40
3
8: add tests for "
d
iff
-
-
cc --raw <tre
e
s>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n Keeping
bu
i
ltin/apply: tighten (d
i
s)similarity in
d
ex parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
ohn Keeping
mergetoo
l
--lib: list user configured tools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John
Kee
p
ing
Rename {git- =
>
git}remote
-
helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
CodingGuidel
i
nes: add Python coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
John
K
e
e
ping
gi
t
-rem
o
t
e-testpy: fix path hashi
n
g on P
y
thon
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Ke
e
p
ing
mer
g
etool--l
i
b
:
do
n
't call
"exit" in se
t
up_
t
ool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
pi
n
g
git-
d
ifftool: use git-mergetool-
-
lib fo
r
"-
-
tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-merg
e
tool: don't hardcode 'm
e
rgetool' in sho
w
_tool_h
e
lp
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
ed
u
ndant a
s
signment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git-m
e
rgetool:
move show_tool_help to merg
e
tool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-r
e
m
o
t
e
-
testpy: call print as a
funct
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
git-remo
t
e-testpy: d
o
n't do unbuffered text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
g
i
t
-
remote-testpy: hash byte
s
e
x
pli
c
itly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
svn-
f
e: allow svn
r
d
u
m
p_s
i
m
.
py to run with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t_r
e
m
o
te_helpe
r
s: use 2to3 i
f
building with Py
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git_remot
e
_helpers: force re
b
uild if
p
y
t
h
on version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keepin
g
g
i
t
-cvsimport
.
t
x
t:
cvsps-2 is deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keeping
gi
t
-
for-each-ref
.
txt: 'r
a
w' is a supported date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
g
i
t_r
e
mote
_
h
e
lpers: fix input when running under Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
Joh
n
K
ee
p
ing
git_remote_helpers: allow building wit
h
Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John K
e
eping
git
-
svn: teach find-rev t
o
find
n
ear
m
at
c
h
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
ohn Keeping
git-fast
-
import
(
1): re
o
rgani
s
e o
p
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
Jo
h
n Ke
e
ping
git-fast
-
import(1): combine d
o
cu
m
entati
o
n of -
-
[n
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John
K
e
eping
git-shortlog(
1
):
do
c
ument behaviour of ze
r
o-width
wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keepi
n
g
git-fast-import(1): r
e
move d
u
plica
t
e '-
-
done' option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John
Ke
e
p
ing
Documentation
:
don't link to e
x
a
mple m
a
il a
d
dresses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Keeping
r
e
base -i cont
i
n
u
e:
don't
s
kip commits that only change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree