repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'ap/path-max'
2013-12-10
Joh
n
K
e
eping
r
ebas
e
:
u
se reflog to find c
o
mmon base with upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keeping
p
ull: use
m
e
r
ge-ba
s
e --for
k
-point wh
e
n app
r
o
p
ria
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
peek-remote: remove deprecated al
i
as of ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John K
e
e
ping
lost
-
found: remove depre
c
at
e
d
c
o
mmand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Keeping
tar-tree: remove deprecat
e
d com
m
an
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
r
epo-config: rem
o
ve deprec
a
ted al
i
a
s
for "
g
it config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
J
o
h
n Ke
e
pi
n
g
D
o
cumentation
/
Makefile: make
AsciiDo
c
d
b
l
ate
x
dir configurabl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
merge-recursi
v
e:
f
ix
parsing
o
f
"d
i
ff-algorithm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Jo
h
n
K
e
eping
reset: handle submodule
with t
r
ailing slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm:
r
e-use pars
e
_pathspec's
trail
i
ng-slash removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Keeping
git_re
m
o
t
e_h
e
lpers:
remov
e
lit
t
le used
Pyth
o
n library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-parse(1): logicall
y
group option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-pa
r
se: remove
r
e
strictions on some optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
J
o
h
n Ke
e
p
i
n
g
pull:
ch
a
n
ge the
de
s
cription
to "
i
nt
e
g
r
ate" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
pus
h
:
a
void suggest
i
ng "merging" remo
t
e
c
hanges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
Keeping
git-config(1)
:
clarify precedence of mu
l
tiple val
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
Joh
n
Keeping
git-
c
onfig: updat
e
do
c
for
--get wit
h
multiple v
a
lues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
c
ompl
e
tion: learn about --man-pa
t
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
ohn Keeping
c
ompletion: handle unstuck
f
orm of b
a
se gi
t
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keepin
g
fas
t
-import:
a
llow moving
the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
eeping
fa
s
t-import
:
allow ls
o
r
filecopy o
f
the
r
oot
t
re
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-import: se
t
v
alid mode
o
n
root tree in "ls
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn Keeping
t9300:
d
oc
u
m
ent fast-import empty path i
s
sues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
submodu
l
e: d
r
op the
top-level requir
e
m
e
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
rev-parse:
add
-
-prefix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keeping
submodule: s
h
ow
full path in e
r
ror message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t740
3
:
add missing && chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403: modernize
s
tyle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t
7401: mak
e
indentation consiste
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
merget
o
ol--lib: refactor {diff,
m
e
rge}_
c
m
d logi
c
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n Keeping
D
o
cument
a
tion/Makefile: m
o
ve inf
o
di
r
to be
w
ith other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
D
o
cumentation/Makefil
e
: fix
s
p
a
ces a
r
o
u
n
d
assignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John
Keeping
add--interactive: respect diff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keepi
n
g
git-gui: fix
file name
h
a
ndli
n
g
w
ith non-empt
y
p
r
e
fix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keepin
g
fetch: don't try to up
d
ate unfetched tracki
n
g r
e
f
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
J
o
hn Keeping
di
f
ftool: fix
d
ir-diff when fil
e
does not e
x
ist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
m
e
rge-tree:
handl
e
d
irectory/e
m
p
t
y
confli
c
t
corre
c
tly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keep
i
n
g
t/Makefil
e
: don't define TEST_R
E
SULT
S
_DIRECTORY recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John
K
eeping
c
ontrib/subtre
e
:
d
o
n
'
t
d
elete remote branches if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
Jo
h
n
K
eeping
test output: respect $TEST_OU
T
PUT_DIRECTOR
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn
K
eepi
n
g
t
/M
a
kefile: remo
v
e smoke t
e
s
t
tar
g
ets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Jo
h
n
Keeping
m
e
rge-tree: fix typo in "
b
o
th changed identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keepi
n
g
t/
M
akefile: fi
x
result handlin
g
with
T
E
S
T_OUTPUT_DIREC
T
ORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
r
ansport-he
l
per: add 'signed-tags' capab
i
lity
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
ping
transport
-
helper
:
pass --signed-tags=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
epi
n
g
fast-export
:
add --signed-tag
s
=warn-strip m
o
de
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
oh
n
Keeping
t/test-lib
.
sh: fi
x
TRASH_DIRECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
m
e
rge-tree
:
don't p
r
i
nt
entries tha
t
match "l
o
cal"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keep
i
ng
gitr
e
m
o
t
e
-h
e
l
p
e
rs(1):
cl
a
r
ify refspec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keepi
n
g
subm
o
dule: print grap
h
output next to
s
u
b
m
o
dule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eep
i
ng
diff: allow unstuck arguments wi
t
h --diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keepin
g
g
i
t
-merge(1): document diff-
a
lgorithm option to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
h
n
Ke
e
p
ing
bisect: avoid si
g
ned integer ov
e
rf
l
ow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John K
e
eping
diffcore-break: don
'
t
d
ivide by
z
ero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7
8
00: ru
n
--d
i
r-diff
tests with and wit
h
o
u
t
s
ymlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepin
g
t7800:
fix tests wh
e
n di
f
ft
o
ol uses --no
-
symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Kee
p
i
n
g
t7800: d
o
n't hide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
d
i
ffto
o
l
:
d
o
n
't overwrite modif
i
ed files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Kee
p
ing
t78
0
0:
move '--sym
l
i
nks' specific t
e
st to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Kee
p
ing
merge-tree: f
i
x typo i
n
me
r
g
e
-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
Jo
h
n Kee
p
ing
refs
.
c: fix fread error h
a
n
dli
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entry: fix
f
ilter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn
K
eeping
t200
3
: mod
e
rnize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool --dir-diff: s
y
mlink all f
i
les matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
diffto
o
l: avoid
double sla
s
hes
i
n sy
m
link targe
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-difftool(1): fix formatting of --symlink descr
i
ptio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John
K
e
epin
g
Revert "graph
.
c
:
mark private file-scope
sy
m
b
o
l
s as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keep
i
ng
Mak
e
file:
m
a
k
e m
a
ndir
,
htm
l
dir and infodir ab
s
olute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eepi
n
g
reb
a
se -i:
r
e
spect core
.
commentcha
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
combine-diff
.
c: teach combined diffs
a
bout l
i
ne prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
diff
.
c: use dif
f
_line_
p
r
efix()
where applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
diff: add
d
i
ff_l
i
ne_prefix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
d
iff
.
c: make constan
t
string arguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
i
ff: write prefix to the
c
or
r
e
ct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
graph: outp
u
t padding fo
r
merge subsequen
t
parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keepin
g
t
4038: add
tes
t
s for "diff --c
c
--raw <t
r
ees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
hn Keeping
builtin/apply:
t
i
g
hten (dis)similari
t
y
i
n
dex parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
mergetool--lib: list
us
e
r configur
e
d tool
s
in
'
--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keepin
g
Re
n
ame {git- => git}rem
o
te-helpe
r
s
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John K
e
eping
CodingGu
i
delines: add
Pyth
o
n cod
i
ng guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-remote-
t
estp
y
: fix
pa
t
h hashing
on
P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
J
ohn Kee
p
ing
mergetool--lib: don't call
"
exit" in
setu
p
_to
o
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-
d
ifftool:
u
se git-mergetool--lib for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergetool:
d
o
n't h
a
rdcode 'merget
o
o
l' in show_tool_h
e
lp
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
gi
t
-mergetool: rem
o
ve redu
n
dant assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
pin
g
git-me
r
getool: move
s
how_tool_help to m
e
rget
o
o
l-
-
lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keepin
g
g
it
-
remote-te
s
tpy: call
p
r
i
nt as a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
-remote-t
e
stpy
:
don't do unbuffered text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote-t
e
stpy:
hash b
y
tes
e
xplicitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keep
i
ng
svn-fe: allow svnrdum
p
_sim
.
py to run wi
t
h P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
git_remote_helpers: use 2to3 if building
wi
t
h Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git_remote_helpers: forc
e
reb
u
ild
i
f python ve
r
sio
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keeping
git-cv
s
i
m
port
.
txt:
c
vsps
-
2 is d
e
prec
a
t
e
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
Jo
h
n
Kee
p
ing
git-for-each-r
e
f
.
txt: 'raw
'
is a s
u
p
ported date f
o
r
mat
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keepi
n
g
git_remote_helpers: fix input when runni
n
g unde
r
P
y
thon
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_remote
_
helpers: allow bui
l
d
i
ng
w
ith Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keeping
git-sv
n
: teach f
i
nd-rev
to find near
matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
g
it
-
fast-
i
mpo
r
t(1): reorganise option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fast-import(1): combine documen
t
ation of --[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
o
h
n
Keeping
git-sho
r
tlog(1): docu
m
ent behaviour of zero-width wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next