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 'jc/triangle-push-fixup'
2013-07-03
Jo
h
n Keeping
git-con
f
i
g
: updat
e
doc
f
or --get wi
t
h mul
t
iple val
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule: drop
th
e
top-le
v
el r
e
qu
i
rement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
re
v
-parse: add --prefix opt
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule: show
full
pat
h
in
e
rror message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
t7403: add missing && chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
t7403:
mod
e
rnize
s
ty
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7401:
m
ak
e
inde
n
tation consisten
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
mergetool--lib: r
e
factor {di
f
f,
m
e
r
ge}_cmd
l
ogic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
D
ocu
m
ent
a
tion/Makefile: move infodir to b
e
with oth
e
r
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keeping
Documentation/Makefile: fix spaces around assi
g
n
ments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John K
e
e
ping
add--intera
c
tive:
respect
d
iff
.
a
l
gorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
Joh
n
Keep
i
ng
git-gui: fix file name ha
n
dling with non-
e
mpty pre
f
ix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Kee
p
ing
fet
c
h
:
don'
t
try to
u
pd
a
te unfetc
h
ed
t
racking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
J
ohn Keepin
g
diff
t
ool: fix dir-diff when file does not ex
i
st in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keepi
n
g
merge-tree: handle directory
/
e
m
pty c
o
nflict correct
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keepi
n
g
t/Make
f
ile:
d
on't d
e
f
i
n
e TEST_RESUL
T
S_D
I
RECTORY
r
ecursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
Jo
h
n Keeping
contrib
/
s
u
b
t
r
ee:
don't dele
t
e remote branches i
f
spli
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John K
e
eping
test
output: respec
t
$
TEST_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/
M
akefile: remove smoke test t
a
r
g
e
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keepi
n
g
merge-tre
e
: fix t
y
po in "both c
h
ange
d
identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t
/
Makefile: fix result handling with T
E
ST
_
OUTPUT_DIRE
C
TORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transport
-
helper: add 'signed-
t
a
gs' capab
i
lit
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn
K
eeping
transport-helper: pass -
-
signed-tag
s
=wa
r
n-stri
p
t
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepin
g
fast-export
:
add --
s
igned-
t
ags=
w
arn-str
i
p mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn K
e
ep
i
ng
t/tes
t
-lib
.
sh: fix TRASH_DIREC
T
ORY ha
n
dling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
J
ohn K
e
epi
n
g
merge-tree: d
o
n't pr
i
nt ent
r
ies
t
hat match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
Joh
n
Keeping
git
r
emote-helpers(
1
)
:
c
larify r
e
fsp
e
c
beh
a
viour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn Keepin
g
submodu
l
e
: print gr
a
ph
out
p
ut next to subm
o
dule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn
K
eeping
diff
:
allo
w
unstuck
arguments
with --di
f
f
-algorit
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
Keepin
g
git-merge(1): document diff-algorithm option t
o
merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Jo
h
n Ke
e
ping
bisect: avoid sign
e
d integer overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John K
e
epin
g
diffcore
-
b
r
eak: don't divide
b
y
z
ero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: run --dir-d
i
ff test
s
with and withou
t
s
y
mlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: fix tes
t
s w
h
en difftool uses --no-symlink
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
t
7
800: don't hide g
r
ep o
u
tput
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keepin
g
difftool: don't overwri
t
e
modifi
e
d files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t
780
0
: move '
-
-symlinks
'
sp
e
cifi
c
test to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Ke
e
ping
merge-
t
r
e
e: fix typo in merge-tree
.
c::unr
e
solved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
re
f
s
.
c
:
fix fread error
h
an
d
ling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
K
e
ep
i
n
g
e
n
tr
y
:
f
i
x
filte
r
lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
t
2
003: moderni
z
e
styl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Ke
e
ping
dif
f
tool --dir-diff:
symli
n
k a
l
l file
s
matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
d
i
fftool: avoid double slashes in symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n
K
eep
i
n
g
git
-
difftool(1): fix for
m
atting of --syml
i
nk des
c
r
i
ption
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John
K
eeping
Revert "graph
.
c: mark private file-sc
o
pe symbols
as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Makefile
:
ma
k
e mandi
r
,
h
tmldir and infodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
r
e
base -
i
: respe
c
t c
o
re
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
co
m
bine
-
di
f
f
.
c:
t
each
c
ombi
n
ed dif
f
s about line p
r
efix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
di
f
f
.
c: use
d
iff_line_prefix() where applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n Keep
i
ng
diff: add diff_
l
ine_prefix
f
unction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
d
i
ff
.
c
: make const
a
nt s
t
ring argument
s
const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keepin
g
diff: write prefix t
o
t
he correct
file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
o
hn Keeping
graph: out
p
ut padding for merge subsequent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Kee
p
i
n
g
t4038: add
tests for "diff --cc --raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
K
eeping
built
i
n/apply: tigh
t
en (dis)s
i
m
ilarity index
p
arsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
ohn Ke
e
ping
mergetool--lib:
l
i
s
t user conf
i
gur
e
d tools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John K
e
e
p
ing
Rename {g
i
t-
=
> git}remot
e
-
helpers
.
t
xt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
o
hn Ke
e
ping
CodingGu
i
d
e
line
s
:
add Python coding
gu
i
deli
n
es
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-re
m
ot
e
-testp
y
: fix p
a
th hashing on Py
t
h
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
mergetool-
-
li
b
: don't call
"exit" in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Kee
p
ing
git-di
f
ftool: 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-
m
er
g
etool: don't h
a
r
dcode 'merget
o
ol' in sho
w
_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
g
i
t-mergetool: remov
e
red
u
ndant assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git-mergetool: mo
v
e show_tool_h
e
l
p to me
r
getool--
l
ib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
git-remot
e
-testpy
:
call print as a func
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Ke
e
p
i
ng
git
-
remo
t
e
-testpy: don't
d
o
unbu
f
f
e
red text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote-
t
e
s
t
p
y
: ha
s
h
bytes explic
i
tly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
s
v
n
-
fe: allow svnrdump_sim
.
py
t
o
run with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_re
m
ote_h
e
lpers: use 2to3 if building with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
git_remote_helpers
:
force rebuild if
p
ython versi
o
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keep
i
ng
gi
t
-cvsim
p
o
rt
.
txt: cvsps-2 is
depre
c
a
t
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Kee
p
ing
git-fo
r
-each-ref
.
txt:
'raw' is a suppor
t
ed dat
e
format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keep
i
ng
git_remote_
h
elper
s
: fix i
n
put
when running unde
r
Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
oh
n
Keeping
git_remote
_
helpers: allow building
w
it
h
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
J
o
hn Keep
i
ng
git-
s
vn: te
a
c
h
find-rev to f
i
nd
n
ear
m
atches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John
K
eepi
n
g
git-
f
ast-i
m
por
t
(1): reorganis
e
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John K
e
ep
i
n
g
git-fast
-
import(1): co
m
bine documentat
i
o
n
of --[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Ke
e
ping
git
-
s
hortlog(
1
): docum
e
n
t
be
h
avi
o
ur of zer
o
-widt
h
wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John
K
eeping
git
-
fas
t
-
import(1): remove duplicate '--done' opt
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
J
ohn
K
eepin
g
Docu
m
entation: don
'
t l
i
n
k
to ex
a
mple mail ad
d
resse
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John
Keeping
rebase -i continue: don't skip c
o
mmits
that only change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree