repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge tag 'post183-for-junio' of http://github.com/msysgit/git
2013-05-28
J
o
hn
Keep
i
ng
fetc
h
: d
o
n
't
try to up
d
a
t
e
u
n
fet
c
hed tracking
r
efs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Ke
e
pi
n
g
difftool: fi
x
dir-diff when file
d
oes no
t
exist
i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keep
i
n
g
merge-tr
e
e: h
a
ndle d
i
re
c
t
ory/empty conf
l
i
c
t correctl
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
Joh
n
Kee
p
ing
t/M
a
kefile: don't define TE
S
T_RE
S
ULTS_DIRECTORY recur
s
ively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keep
i
ng
c
o
ntri
b
/sub
t
ree: don't delete
r
e
m
ote branche
s
if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
J
ohn Keepi
n
g
test output: re
s
pect $TEST_OUTPUT
_
DIRECT
O
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefile: rem
o
ve sm
o
ke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
ohn Keepi
n
g
merge-tree: fix typo i
n
"bo
t
h changed iden
t
ic
a
ll
y
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Kee
p
ing
t/
M
akefi
l
e: fix result handling with TEST_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
K
e
epin
g
transport-
h
elper: a
d
d
'
signed-tags'
capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
tra
n
spor
t
-helper: pass --signe
d
-
tags
=
warn-strip
t
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-
e
xp
o
rt: a
d
d --signed
-
tags=warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keepi
n
g
t/
t
est-l
i
b
.
sh: fix TRAS
H
_DIRECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
Joh
n
Keeping
mer
g
e
-
tre
e
: don't print entr
i
es that match "loca
l
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John K
e
epin
g
g
it
r
emot
e
-help
e
rs(1
)
: clarify ref
s
pec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
s
u
bmodule
:
p
rint graph outp
u
t next to submodul
e
log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn Keeping
diff: allow unstu
c
k
argum
e
nts
w
ith
--d
i
f
f
-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
rithm option to
merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Kee
p
i
n
g
bis
e
ct: avoid signed integer
overflo
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
K
ee
p
i
n
g
diffcor
e
-break
:
don't d
i
vide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepin
g
t7800
:
run --dir-diff tests with and witho
u
t symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepin
g
t7800: fix tests when dif
f
tool
use
s
--no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
h
n Keeping
t7800: d
o
n't hide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
pin
g
difftool: don't
o
verwrite
modified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keep
i
ng
t7
8
00: move '-
-
syml
i
nks' spec
i
fic
te
s
t
t
o
the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
Jo
h
n
Keepi
n
g
merg
e
-tree: fix typ
o
i
n m
e
rge-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
J
o
hn
K
e
e
ping
ref
s
.
c
: fix fread
e
rror hand
l
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
en
t
ry: f
i
x f
i
lter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Keeping
t2003: mod
e
rnize sty
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool -
-
dir
-
diff
:
symlink a
l
l files matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
di
f
ftool: avoid
d
ouble s
l
ashe
s
in symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
git-dif
f
tool(1)
:
fix formatting of --
s
yml
i
nk description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
Jo
h
n Keeping
Revert "graph
.
c: mark
private file-scope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
Joh
n
K
eeping
Makef
i
l
e: make mandir, htmldir and infodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
re
b
ase
-
i
: respect co
r
e
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
combine-diff
.
c
: teach combi
n
ed
diffs
a
bout
l
ine prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
diff
.
c: use diff
_
line_prefix() where
a
p
p
licable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
diff: ad
d
d
iff_line_prefi
x
function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n
K
eepi
n
g
di
f
f
.
c
:
make constant string arguments c
o
n
s
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: write prefix
t
o the correct
file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
graph: output padding f
o
r mer
g
e sub
s
equent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Kee
p
ing
t
4
038
:
add
t
e
s
ts
for
"
diff --cc --raw <tr
e
es>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
K
eeping
builtin/apply: tighten
(dis)s
i
milarity index parsin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
m
e
rgeto
o
l--lib: l
i
st u
s
er configured tool
s
i
n
'--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Re
n
a
m
e
{
git- => git}remote-
h
elpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John
Keeping
Coding
G
uidelines: a
d
d Python cod
i
n
g guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keepi
n
g
git
-
remote-testpy: fix
p
a
t
h
hashing
o
n Pyth
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keep
i
n
g
mergetool-
-
lib: don't
c
all "exit"
i
n setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t-difftool: use g
i
t-m
e
r
g
e
tool--lib for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn
Keeping
git
-
mergetool: don't
h
ar
d
cod
e
'm
e
r
g
etool' in show_tool_
h
e
lp
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t
-mergetool: remove
r
edu
n
dant ass
i
gnme
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
pi
n
g
git-mer
g
e
t
o
o
l: move s
h
ow_tool_help
to m
e
rgetool-
-
lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git-rem
o
te-tes
t
py: call print as
a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git
-
r
emote-te
s
tpy: d
o
n'
t
do
u
nbuffe
r
ed t
e
xt I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git-remote-testpy: h
a
sh byt
e
s
explicitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keepin
g
s
v
n-fe:
allow
svnrdump_sim
.
py to run with Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Kee
p
i
n
g
git_remote_helpers:
u
s
e
2
t
o3 if b
u
ilding
with Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn
Keeping
git_r
e
mot
e
_
helpers
:
fo
r
ce
r
ebuild i
f
pyth
o
n version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
Jo
h
n Keeping
git
-
cvsi
m
port
.
txt: cvsps-2 is deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
J
o
hn
Keep
i
n
g
g
it-for-each-ref
.
txt: 'raw' is
a
supported date for
m
at
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_remote
_
helpers: fix inpu
t
when running under Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
ohn Keeping
git_remote_
h
e
l
p
e
rs: allo
w
b
uilding with Py
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John
Ke
e
p
i
ng
git-svn: teach
f
ind-rev to find near
m
atches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
ohn Keeping
git-fast-im
p
ort(1): reorganise options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
Joh
n
Keep
i
ng
git-fas
t
-import(1): combi
n
e docum
e
ntation of --[n
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
ohn Keepin
g
g
i
t-sh
o
rtlog(1): document behaviour of zer
o
-wid
t
h
wr
a
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keeping
git-fast-import
(
1): remove dupl
i
cate '
-
-
do
n
e
'
option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John Keepi
n
g
Documentation
:
don't link to examp
l
e mail
a
d
dre
s
s
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Keeping
r
e
ba
s
e -i continue:
d
on't skip commit
s
that only change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree