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 'mm/status-without-comment-char'
2013-09-09
Jo
h
n Keeping
git_rem
o
te_helper
s
: remove little used Python library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
o
hn Keeping
r
e
v-pa
r
s
e
(1):
l
ogi
c
ally
g
r
oup options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John K
e
eping
rev-parse: rem
o
ve restrictio
n
s on some options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
p
ull:
c
hange t
h
e desc
r
iptio
n
t
o
"i
n
tegrate" cha
n
ges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
K
eeping
push: avo
i
d
s
u
g
g
e
sti
n
g
"merging" remot
e
chang
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Ke
e
ping
git-c
o
nfig(1): c
l
arify precedence
o
f multiple
v
alues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keep
i
ng
git
-
config: update doc for
-
-get with multip
l
e values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
o
hn Ke
e
ping
completion:
learn about --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Jo
h
n Keeping
co
m
p
letio
n
: handle u
n
stuck form of ba
s
e
g
it options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John K
e
eping
f
ast-import: allo
w
moving the root t
r
ee
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n Keeping
fast-impor
t
: allow
ls or filecopy o
f
the root tr
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fa
s
t-
i
mport: se
t
v
alid mode on roo
t
t
r
ee in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keepin
g
t9300:
d
ocument f
a
st
-
imp
o
rt emp
t
y
p
ath iss
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule: drop th
e
top
-
level requiremen
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
rev-pa
r
se:
a
dd -
-
prefix
opti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule: show full path i
n
e
rror
mess
a
ge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403: add missi
n
g
&& chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keeping
t
7
4
03: modern
i
ze style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
t
7
40
1
: ma
k
e indentat
i
on
cons
i
st
e
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
me
r
getool-
-
lib: refac
t
or {diff,merge}
_
cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Documentation
/
Mak
e
file: move
i
nfodir to be
with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
K
eeping
D
ocumen
t
ation/Mak
e
f
i
le: fix space
s
aro
u
nd
assig
n
m
e
n
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
add--interactive: res
p
ect diff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John K
e
eping
gi
t
-gui: fix f
i
le name handli
n
g
with no
n
-
em
p
ty
p
r
efix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John K
e
epin
g
fetc
h
: d
o
n
'
t try to update unfetched tr
a
cking
refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
difftoo
l
: fix
d
ir-di
f
f
when file
does not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-tree: handle directory/empty conflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/Makefile: do
n
't define TE
S
T_
R
E
S
ULTS_DIRECTORY recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Kee
p
ing
contrib/subtree: don't delete rem
o
t
e
branche
s
if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
Jo
h
n Kee
p
ing
te
s
t output: respect
$TEST_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Joh
n
K
eeping
t/Makefile: rem
o
ve s
m
oke te
s
t
targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merge
-
tree
:
f
ix typo in "both changed iden
t
ically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
J
o
hn Keeping
t/Makefile: fix r
e
sult han
d
ling
with TEST_OUTPUT
_
DIRECT
O
RY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
eping
transport-helper:
a
dd 'signed-tags
'
capa
b
i
lit
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn
Keepin
g
transpo
r
t-helper
:
pa
s
s
--
s
ig
n
ed-
t
ag
s
=warn-strip t
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-ex
p
or
t
: add
-
-signed-tags=warn-
s
t
rip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
pi
n
g
t/t
e
st-lib
.
sh:
f
ix TRASH_DIREC
T
ORY ha
n
dli
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
Jo
h
n Keeping
merge-tree: don't p
r
int en
t
r
i
es tha
t
matc
h
"local
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
J
o
hn Keeping
gitremote
-
helpers(1): clarify refspec beh
a
viour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n Keeping
s
ubmodul
e
: p
r
int g
r
aph outp
u
t next to su
b
modu
l
e log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn K
e
eping
dif
f
:
a
llow unstuck ar
g
um
e
nts with --diff-
a
lgori
t
hm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Ke
e
ping
git-merge(
1
)
:
docu
m
ent dif
f
-algor
i
thm option to
m
erge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisect: avoid signed
i
nteger
o
v
erflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keepi
n
g
diffcor
e
-break:
don't di
v
ide
b
y z
e
ro
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keeping
t7800: run --dir-diff tests wi
t
h
a
n
d
w
ithout
symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn
Keeping
t7800: fix tests when difft
o
ol uses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
oh
n
Keeping
t7
8
00: don'
t
hide grep ou
t
put
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
di
f
ftool:
d
on't overwrite modified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eeping
t7800:
m
o
ve '
-
-
s
ymlinks' specific test to t
h
e
end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
o
hn K
e
ep
i
n
g
merge-tree: fix typo i
n
merge-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John
K
eeping
refs
.
c
:
fix fread error h
a
ndling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
e
n
try:
f
ix filter
l
o
okup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2003: mod
e
r
n
i
z
e
sty
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
difftool --di
r
-diff:
s
ymlink all fil
e
s
m
a
tchin
g
the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
pi
n
g
difftool: avoid doubl
e
slash
e
s
in syml
i
nk targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-difftool(1): fix format
t
i
n
g of --sy
m
link de
s
cription
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Revert "graph
.
c
:
mark p
r
ivate f
i
le-
s
cope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
oh
n
Keeping
Makefil
e
:
make
m
andir, htmld
i
r and infodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebase -i: respec
t
core
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
combine-diff
.
c
: teach
combined dif
f
s about line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keep
i
ng
diff
.
c:
use diff_line_prefi
x
() wh
e
r
e
applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: add diff
_
line_
p
refix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
diff
.
c: mak
e
constant string
a
r
g
ument
s
const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
diff: w
r
ite prefix to the corr
e
ct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John
K
ee
p
ing
g
raph: output pad
d
in
g
for m
e
rge subseque
n
t pa
r
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t
4
038: add tests for "di
f
f
-
-cc --raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin/apply: t
i
ght
e
n
(
dis)simi
l
ar
i
ty index pa
r
sing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
Keeping
merget
o
ol--lib: lis
t
use
r
configu
r
e
d
tools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
o
hn Keeping
Rena
m
e {git-
=> git}remote
-
helper
s
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
CodingG
u
idelines: add Pyth
o
n
codi
n
g gui
d
elines
commit
|
commitdiff
|
tree
2013-01-28
John
Keeping
git-remote-
t
estpy: fix pat
h
hashing
o
n Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John
Keeping
m
e
rgetoo
l
--lib
:
don't call "exit" in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
git-dif
f
tool: use git-
m
e
rgetool
-
-
lib
f
or "--too
l
-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
git-mergetool: don't
h
a
rdcode
'
m
e
rge
t
o
o
l' in s
h
ow_to
o
l
_
h
e
l
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
g
i
t-
m
ergeto
o
l: remo
v
e
r
edun
d
a
n
t assi
g
n
m
en
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n Keeping
git
-
mer
g
eto
o
l
: mo
v
e
s
how_to
o
l_help t
o
m
e
rgetoo
l
-
-lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
gi
t
-remote-tes
t
py: call
pr
i
n
t as a
fun
c
tio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Ke
e
p
ing
git-r
e
mo
t
e-
t
estpy: don
'
t
d
o unbuffe
r
ed text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git-r
e
mote-t
e
stpy: hash byte
s
expl
i
c
itly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
svn-fe: allow svn
r
dum
p
_sim
.
p
y to run
w
ith
Pyth
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_remote_helpers: use 2to3 if b
u
ild
i
ng with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n
Keeping
g
i
t_remote_helpers: fo
r
ce r
e
bui
l
d i
f
python version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John
K
eeping
gi
t
-
c
vsimport
.
txt:
c
v
sps-2 is depreca
t
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
Joh
n
Keeping
git-for
-
each-ref
.
txt: 'raw' is a supported date form
a
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_rem
o
te_helpers: fix input when
r
u
n
ning under Pyth
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keep
i
n
g
git_
r
emote_helpers:
allow building
w
ith Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
J
o
hn
K
eeping
git
-
s
vn:
teac
h
find-rev
to
f
in
d
near matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Ke
e
ping
git-fast-import(1): reorganise options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Ke
e
pin
g
g
i
t-fa
s
t-imp
o
rt(1): comb
i
ne
d
ocumentation o
f
--[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John K
e
ep
i
n
g
git-shortlog
(
1): docum
e
nt b
e
haviour o
f
zero-width wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keeping
gi
t
-fast
-
im
p
ort(1): r
e
move duplicat
e
'
--
d
one' opt
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John Keeping
Do
c
umentat
i
on: don't link to ex
a
mple mail
a
dd
r
esses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Ke
e
p
i
n
g
r
e
base -i contin
u
e: don'
t
s
k
ip
c
o
mmits th
a
t onl
y
c
hange
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree