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 'cr/git-work-tree-sans-git-dir' into maint
2013-07-03
John Keeping
git-c
o
nf
i
g
: update d
o
c
f
or --get with mult
i
p
l
e val
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
diffto
o
l:
f
ix dir-diff when file does not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Kee
p
ing
merge-t
r
ee: handle dire
c
t
ory
/
emp
t
y con
f
l
i
ct corre
c
tl
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
J
oh
n
K
eeping
co
n
tri
b
/subtree:
d
on't delete remote branches if
s
plit
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John K
e
eping
t/Makefile
:
remove
s
moke
test t
a
rgets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John K
e
ep
i
ng
merge-tree: fix
typo in "both change
d
identically
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
ng
transport-helper: add 'signed-tags' capab
i
l
ity
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Keeping
transpo
r
t-
h
el
p
er: pass --si
g
n
e
d-tags=war
n
-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Keeping
fast-export: add
-
-
signed-t
a
g
s=warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
i
ng
t
/test-lib
.
s
h
: fix TRASH_D
I
RECTORY
handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
J
o
hn Keeping
m
e
rge-tree: don't pri
n
t en
t
ries that match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John
Ke
e
p
i
ng
gitremote-helper
s
(1): clarify refspec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keepi
n
g
sub
m
odule: p
r
int graph output next to sub
m
odu
l
e log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
di
f
f: all
o
w unstuck arguments with
-
-
diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
git-m
e
rge(1): document diff
-
algorithm option to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
Keepi
n
g
bisec
t
:
avoid sign
e
d
integer over
f
low
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keepi
n
g
diffcore-br
e
a
k
:
d
o
n't di
v
ide
b
y zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t7800: run --dir-diff tests with and
without
s
ymlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Ke
e
p
i
ng
t780
0
: fix tests
w
hen dif
f
t
o
o
l
uses --
n
o-s
y
mlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn K
e
e
ping
t7800: don't
h
i
de grep outpu
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keepi
n
g
diff
t
o
o
l:
d
on't
o
ve
r
write m
o
d
i
fi
e
d f
i
les
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
ee
p
ing
t78
0
0
: move '--symlinks' specific
t
est
to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
m
e
r
ge-tree:
fix typo
i
n me
r
ge-
t
ree
.
c::u
n
r
esolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
J
o
hn
K
e
e
ping
refs
.
c
:
fix f
r
ead error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
entry: fix
f
ilter lo
o
k
up
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepi
n
g
t
2003: moder
n
i
z
e styl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
diffto
o
l --dir-
d
iff:
s
ymli
n
k
a
ll
files ma
t
ching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keep
i
ng
dif
f
tool:
a
v
oid double slashes in symlink targ
e
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-
d
ifftoo
l
(1): fix for
m
attin
g
of
--symlink descripti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Kee
p
ing
R
e
v
e
rt "graph
.
c: ma
r
k private file-scope symbol
s
as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Mak
e
f
ile: ma
k
e
m
and
i
r, htmldir
an
d
infodir absolut
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebase -i: respect core
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
c
ombine-
d
iff
.
c
:
tea
c
h comb
i
ned diffs a
b
out l
i
n
e pr
e
fix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn
Keeping
d
i
ff
.
c: use diff_
l
i
ne_prefix()
w
here applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keep
i
ng
diff: add diff_line_p
r
efix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
diff
.
c
:
ma
k
e co
n
stant strin
g
arguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
pin
g
d
i
ff: write pref
i
x to t
h
e correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
o
hn Keeping
gr
a
p
h
: outpu
t
pa
d
ding f
o
r
merg
e
subsequ
e
nt p
a
rents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Ke
e
p
ing
t4038: add tests
for "diff
--cc --raw
<tree
s
>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
hn Keeping
buil
t
in/appl
y
:
t
ighten (dis)simila
r
ity
i
n
dex
p
arsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
K
eeping
merget
o
ol--lib:
list
u
ser configured tools in '--t
o
ol
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
Joh
n
Keepi
n
g
Renam
e
{git- => git}remote-helpers
.
t
xt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
CodingGuidelines: a
d
d Python codi
n
g
guidel
i
nes
commit
|
commitdiff
|
tree
2013-01-28
J
o
hn K
e
eping
git
-
remo
t
e-test
p
y:
fix path hashing
on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Kee
p
i
ng
mergetool--lib:
d
on't
c
a
l
l "exit" in
s
etup_
t
ool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn
Keepi
n
g
git-diffto
o
l:
u
s
e
gi
t
-m
e
rgetool--lib
for
"
--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-mer
g
etool: do
n
'
t
har
d
code 'm
e
rgetool' i
n
sh
o
w_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mer
g
etool: remove re
d
undant assignme
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
git-mergetool: mo
v
e show_tool_help to mergetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git-re
m
ot
e
-te
s
t
p
y: call print as a f
u
n
c
ti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
git-remote-testpy: don't do unbuffered text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-remote-testpy: hash b
y
tes explicitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
svn-fe:
allo
w
s
vnr
d
ump_sim
.
py
t
o ru
n
with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
git_remote_helpers:
u
se 2to3 if bu
i
lding with Pyt
h
o
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
it_re
m
ote_hel
p
ers: force re
b
uil
d
if pytho
n
version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John K
e
e
p
ing
git-cvsimpo
r
t
.
txt: c
v
sps
-
2 is deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keeping
git-for
-
each-ref
.
txt: 'raw' is a sup
p
orted date
format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John
K
e
e
ping
git_remote_helpers: fix input when running unde
r
Py
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
o
hn Keepi
n
g
g
it_remote_helpers
:
al
l
o
w
buil
d
ing wi
t
h Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John
K
ee
p
ing
git-svn: t
e
ach
f
ind-rev to fin
d
near
m
atches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John K
e
ep
i
ng
git-fast-
i
mport(1): reorganise o
p
t
i
o
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
ohn K
e
eping
git-fast-
i
mport(1): combine documentation of --[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
o
h
n Keep
i
ng
git-sho
r
tl
o
g(1): document
be
h
aviour of zero-width wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John
K
eeping
git-fast-import(1):
r
emov
e
duplica
t
e '--d
o
ne' option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John Keeping
D
o
cument
a
tion: d
o
n'
t
link to
e
xample mail add
r
esses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Keeping
rebase -i cont
i
nue: don't skip commits that onl
y
chan
g
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree