repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jk/format-patch-from'
2013-07-08
John Keeping
pull: change the desc
r
ipt
i
on to
"
integrate"
c
han
g
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Joh
n
Keeping
push: avoid sugges
t
i
n
g "merging"
remo
t
e
cha
n
ges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
o
hn Ke
e
ping
git-co
n
f
ig(1):
clar
i
fy precedence of
m
ultiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
git
-
con
f
ig
:
update doc fo
r
--get with multi
p
le
values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
ohn Keeping
complet
i
on: l
e
a
r
n about --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Joh
n
Keeping
co
m
pletion
:
hand
l
e unstuck form of b
a
se git
o
p
t
i
o
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
su
b
module: d
r
op the top-level requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn
K
e
eping
rev-parse: add --pre
f
i
x
option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
submodule: show full path in error messa
g
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403: add mi
s
sing && chain
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
p
ing
t740
3
:
m
o
d
ernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
t7401: ma
k
e in
d
entation
c
o
nsis
t
ent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
K
eeping
mergetoo
l
-
-
lib:
refactor {diff,merge}_cm
d
l
ogic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
Document
a
ti
o
n/Makef
i
l
e: move
i
nfodir to be with
other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Do
c
um
e
ntation/Makef
i
l
e: f
i
x
spac
e
s ar
o
und assi
g
nmen
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
J
ohn K
e
epi
n
g
add--interactive:
r
es
p
ect diff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
Joh
n
Keeping
g
it-g
u
i
: f
i
x file name h
a
nd
l
ing with non-em
p
ty pref
i
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John K
e
eping
f
e
tch: don't
try to
update unfetched tracking
refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John
K
eeping
dif
f
tool: fix di
r
-
d
iff when
file does
n
ot exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
J
oh
n
Keeping
merge-tre
e
: handle
di
r
ectory/e
m
p
t
y
co
n
flict corr
e
ctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John
Keeping
t/Makefile: do
n
't
d
e
fine
T
E
ST_RESULTS_DIRECTORY
r
ecur
s
ively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
contrib/
s
ubt
r
ee: don't
delete remote bran
c
he
s
if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
t
es
t
o
utput: re
s
pect $TES
T
_O
U
T
P
UT_DI
R
EC
T
OR
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn Ke
e
p
ing
t/Mak
e
f
ile:
remove
smoke test
t
a
r
g
e
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Joh
n
Kee
p
ing
me
r
g
e-tree: fix
typo in "both changed
identi
c
ally"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t/
M
akefile
:
fi
x
res
u
l
t
handli
n
g with TEST_OUTPUT_DIRE
C
TORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Kee
p
ing
transp
o
r
t
-helper: add '
s
igned-ta
g
s'
c
a
p
a
bility
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
r
a
ns
p
o
rt-
h
elper: pass --signed-tags=warn-st
r
ip
to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-expo
r
t: add --
s
i
g
ned
-
tags=
w
arn-strip
mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
p
ing
t/test-lib
.
sh
:
fix TRASH_DIRECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
J
o
hn Keeping
merge-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
Joh
n
Keepin
g
gitremote-helpers(1): clarify r
e
fspec be
h
a
v
iour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
submodule: print gra
p
h out
p
ut next to subm
o
dul
e
log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
diff: all
o
w unstuck ar
g
uments wi
t
h --diff-
a
lgorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
Keepi
n
g
g
it-merge(1): docu
m
ent diff-al
g
orit
h
m opt
i
on t
o
merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bis
e
ct: avoid signed in
t
e
ger overflo
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
diff
c
o
r
e-bre
a
k: don't divid
e
by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keepi
n
g
t7
8
00:
r
un
-
-dir-diff t
e
sts with
a
nd wit
h
out
s
ym
l
in
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn K
e
eping
t7800: fix tests when di
f
ftool uses
-
-
no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t
7
80
0
: do
n
't hi
d
e
g
r
ep o
u
tput
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepi
n
g
di
f
ftool:
don't o
v
er
w
rite modified file
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
t
7
800:
move '--symlinks
'
spec
i
fic test to
t
he end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John
Keeping
merge-tree: fix t
y
po
in
merg
e
-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keepi
n
g
refs
.
c
:
f
i
x fread err
o
r h
a
ndling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
ent
r
y
: fix filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepin
g
t2003: moderni
z
e style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difft
o
ol --dir-diff: symlink a
l
l
fi
l
es matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
d
i
fftoo
l
: avoid double slas
h
es
in s
y
mlink targ
e
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepin
g
git-difftool(1):
f
ix for
m
a
t
ting of -
-
sym
l
in
k
descr
i
ption
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
Joh
n
Keep
i
ng
R
e
vert "g
r
aph
.
c: mark private file-scope sy
m
bols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
Jo
h
n
Ke
e
pin
g
Makef
i
le: make
m
a
n
d
ir,
h
tmldir a
n
d infod
i
r
absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
rebase -i: respec
t
core
.
c
o
mmen
t
char
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
combi
n
e-d
i
ff
.
c:
teach
c
o
mbine
d
d
i
ffs
a
b
o
ut line
pre
f
ix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keep
i
ng
di
f
f
.
c
:
use diff_line_p
r
efix()
w
here applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: add diff_line_prefix
function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
diff
.
c: make constant string argume
n
ts const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
diff: write prefix to
th
e
correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John K
e
eping
graph:
out
p
ut pa
d
ding for me
r
ge s
u
bsequent paren
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keepi
n
g
t403
8
: add tests for
"diff --cc --raw <t
r
ees>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Joh
n
Keepin
g
b
uiltin/ap
p
ly: tigh
t
e
n
(dis)similarity index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John K
e
eping
merg
e
tool
-
-
lib: list user configured
tools
in '
-
-tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Ke
e
p
i
ng
Rename {
g
i
t
- => git}re
m
ote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
Codin
g
Guidelines: add Pyth
o
n coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
John
K
eeping
git-r
e
mote-testp
y
: f
i
x path hashing on Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John
K
ee
p
ing
merge
t
oo
l
--li
b
: don't cal
l
"e
x
it
"
i
n
setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
e
p
ing
git-diff
t
ool: use git-merg
e
tool
-
-
l
i
b for
"
--
t
ool-hel
p
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn K
e
eping
gi
t
-me
r
getool:
don't ha
r
d
code
'merge
t
ool
'
i
n
show
_
tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git-mer
g
etool: remo
v
e redund
a
nt assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-mergetool:
move
s
how_to
o
l
_he
l
p to mer
g
eto
o
l--l
i
b
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-
r
e
mote-te
s
tpy:
call print as a
f
uncti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n Keeping
git-remote-test
p
y: don't do u
n
buffe
r
ed text
I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
g
i
t
-remote-testp
y
:
hash by
t
es explicit
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
s
v
n
-
fe: allow svnrdump_
s
im
.
py to r
u
n with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
g
it_remote_helpers: use 2to3 if
b
uilding with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git_rem
o
t
e_helpers: forc
e
rebuild if
python version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
J
ohn Keeping
git-cvsimport
.
txt
:
cvsps-2
i
s depre
c
at
e
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keeping
git-for-e
a
ch-re
f
.
txt: 'ra
w
' is a supported date
format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_remote_
h
e
lp
e
rs
:
fix input when run
n
i
ng under Pyt
h
on 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
g
i
t_remote_helpe
r
s:
allow building with
P
ython
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keepin
g
git-svn:
teach find-
r
ev to find near matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-
f
ast-im
p
o
r
t(1): reorganise option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keepin
g
git-f
a
st-im
p
ort(1):
c
o
m
bine d
o
cumentat
i
o
n o
f
--[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
ohn Keeping
git-sh
o
rtl
o
g(1): document be
h
aviour of zero
-
wi
d
th
w
r
ap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keep
i
n
g
gi
t
-fast-i
m
port(1): remove duplica
t
e '--done
'
option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
J
o
hn Keepin
g
Do
c
umentation: do
n
't link to examp
l
e mail a
d
dre
s
ses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Keep
i
ng
rebas
e
-
i con
t
i
n
ue: don't skip commits
t
ha
t
o
n
ly change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree