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 branch 'maint'
2013-07-03
John Keeping
g
i
t-co
n
f
i
g
: update doc for
-
-get with multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
submodu
l
e: drop t
h
e top-level requi
r
e
m
e
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
rev-parse:
add --
p
refix op
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
submodu
l
e: show ful
l
p
ath in
e
rror message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keeping
t7403
:
add
m
i
ssing && chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
n
g
t
7403: modernize styl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
t7401: make i
n
dentation consisten
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepin
g
mergetoo
l
-
-lib: re
f
a
c
tor {diff,merge}_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
oh
n
Keeping
Document
a
t
io
n
/Makefile
:
move infodir to
be wit
h
other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keepin
g
Documen
t
ation/Makefile: fix spaces arou
n
d assignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Kee
p
in
g
add--inter
a
c
t
ive: respec
t
d
iff
.
alg
o
ri
t
hm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
Joh
n
Keeping
git-gui
:
fi
x
fil
e
n
a
me handling w
i
th
non-em
p
t
y
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
J
ohn Keeping
fet
c
h: don't tr
y
t
o
updat
e
unfet
c
he
d
tracking r
e
fs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
J
o
h
n
Keepin
g
dif
f
t
o
ol: fix dir-di
f
f
when fil
e
doe
s
not exis
t
i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
Jo
h
n
Ke
e
ping
merge-tree: handl
e
directory/e
m
p
ty
c
onflict c
o
rrectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John
Ke
e
ping
t
/
Makef
i
l
e: don't
d
efine
T
EST_RESU
L
T
S
_DI
R
ECTORY recursiv
e
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keepi
n
g
contrib/subtree: d
o
n't delet
e
remote branches if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
J
o
h
n
Keeping
t
e
s
t
output: respe
c
t $TEST
_
OUTPUT_DIR
E
CTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Jo
h
n
Keeping
t
/Makefi
l
e
:
remo
v
e
smoke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
m
erge-tree: fix ty
p
o
in "both chang
e
d
identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Ke
e
ping
t/Make
f
ile: fix res
u
lt handling
w
i
th TEST_OUTPUT_DI
R
EC
T
ORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
oh
n
Keepi
n
g
transport-helper: ad
d
'sig
n
ed-ta
g
s' c
a
pa
b
ility
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eeping
transport-helper: pass
-
-signed-
t
ags=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn
Keeping
fast
-
export: add --signed-ta
g
s=w
a
r
n
-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
/
test-li
b
.
sh:
fix TRASH_DIREC
T
OR
Y
handli
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John
K
eeping
merge
-
tr
e
e: don't prin
t
e
n
tri
e
s
t
hat match "loca
l
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
g
i
t
remote-helper
s
(1): clarif
y
refspec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn Keeping
s
ubm
o
dule: pri
n
t
gr
a
p
h o
u
tp
u
t
next t
o
submodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n Kee
p
in
g
diff
:
allow unstuck argumen
t
s
w
ith --di
f
f-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eeping
git-merge
(
1
)
: document diff-algori
t
hm
optio
n
t
o
merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Ke
e
ping
bisect: avoid signed integer overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Jo
h
n
K
e
eping
diffcore-break: do
n
't
d
iv
i
de by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
t7
8
00: run
--dir-d
i
f
f te
s
ts
w
ith and witho
u
t symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: fix tests when difftool
use
s
--no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
ing
t
7800: don't
hide grep out
p
ut
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepi
n
g
difftool: do
n
't
o
v
erwrite
modified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keepin
g
t780
0
: mo
v
e
'--sym
l
i
n
ks' specifi
c
test to
t
he end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
merge-
t
ree: fix typ
o
in
m
erge-tr
e
e
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John
K
e
e
ping
refs
.
c: fix fread e
r
ror
h
an
d
li
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
epin
g
en
t
ry: fix
f
il
t
er lo
o
k
up
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Ke
e
ping
t
2
003:
m
odernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
K
e
epi
n
g
difftoo
l
--
d
i
r-diff: symlink all files matchi
n
g
t
he
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool
:
avoi
d
doubl
e
sl
a
shes in symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
git
-
dif
f
tool(1)
:
fi
x
formatting of --symlin
k
descr
i
ption
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John
K
eep
i
n
g
R
evert
"
graph
.
c: m
a
rk
p
rivate f
i
le-scope symb
o
l
s as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Mak
e
file: make m
a
ndir, htmldir
a
nd infodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
r
eba
s
e -i: respect core
.
comm
e
ntchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keepi
n
g
combi
n
e
-di
f
f
.
c
:
te
a
c
h
combined diff
s
a
b
out l
i
n
e
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n Keeping
diff
.
c: use diff_line_prefi
x
(
)
wher
e
applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
diff: a
d
d diff_line_pref
i
x
f
unctio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eeping
diff
.
c: make constant
s
tring
arguments
const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
diff: write prefi
x
t
o
th
e
correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
g
ra
p
h:
o
utput paddin
g
fo
r
merge
s
u
b
sequent
p
arents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
Jo
h
n Keeping
t4038: add tests for "diff --cc
-
-raw <tre
e
s>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n
K
eepi
n
g
builtin/apply: tighten (di
s
)simila
r
i
ty index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keepin
g
mergetool--
l
ib: list u
s
er configure
d
tools in '--
t
ool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John K
e
eping
Re
n
ame
{
git- =
>
git}remote-
h
elper
s
.
t
xt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
CodingGuidelines: add P
y
thon coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
g
it-rem
o
te-t
e
stpy: f
i
x path h
a
shing on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Ke
e
ping
mergeto
o
l
--lib: don't c
a
l
l "exit" in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
e
ping
git-dif
f
t
ool:
use g
i
t-merget
o
ol--
l
ib for "--
t
ool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergeto
o
l: d
o
n't ha
r
dcode 'me
r
getool' in sho
w
_to
o
l_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
eping
git-mergetool:
r
emov
e
redundant assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-merget
o
ol
:
move show_too
l
_help t
o
merg
e
tool--
l
ib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git
-
remote-testpy: cal
l
print as a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git
-
rem
o
te-testpy: don't d
o
u
nbuffered tex
t
I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git
-
r
em
o
te-testpy
:
hash bytes exp
l
icitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
svn-
f
e: allow svnr
d
u
m
p
_
si
m
.
py to
r
un with Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Kee
p
ing
g
it
_
r
emote_helpers: use 2to3 i
f
building
with P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git_re
m
ote_helpers: fo
r
ce rebuild if python
v
er
s
i
on
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keeping
git-cvsimport
.
t
x
t:
cvsps-2 is depr
e
cated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John K
e
epin
g
git-for-ea
c
h-re
f
.
t
x
t: 'raw' i
s
a suppor
t
ed date forma
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
ohn Keepin
g
git_
r
emot
e
_help
e
rs
:
fix input when
r
u
nning un
d
e
r
Py
t
hon
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keepin
g
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 Keeping
gi
t
-svn: teach
f
i
n
d-rev to find
n
ear matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fast-imp
o
r
t
(1): reorganise
o
ptio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John K
e
epi
n
g
git-fast-import(1): com
b
i
ne d
o
c
u
mentati
o
n of -
-
[
n
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
gi
t
-shortlog(
1
)
:
d
ocument behaviour of ze
r
o-widt
h
wra
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keeping
gi
t
-fast-imp
o
r
t(1): remove
d
uplicat
e
'--done' opt
i
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
Jo
h
n
Keep
i
ng
Document
a
tion: don't li
n
k
to exam
p
le mail
addresses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John K
e
ep
i
ng
rebase -i continue: don't skip commits th
a
t o
n
ly change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree