repo.or.cz
/
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 'mm/checkout-auto-track-fix'
2013-10-03
Joh
n
K
e
epin
g
D
ocu
m
ent
a
tion/M
a
kefile
:
make As
c
iiDoc dblatex
d
ir
configurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John
K
eeping
merge-recursive: fix
p
arsing of "diff-algori
t
h
m" opti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John
Keeping
res
e
t: handle submodule with
t
raili
n
g slas
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keepi
n
g
rm: re-use parse_p
a
thspec'
s
trailing
-
slash removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Keeping
git_remote_helpers: remove littl
e
used Pytho
n
library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Kee
p
ing
rev-parse(1):
logically group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Ke
e
ping
re
v
-p
a
rse: remove rest
r
ictions
o
n some opt
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
Jo
h
n Keeping
pull: cha
n
ge
the description
to "
i
ntegra
t
e" c
h
anges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
p
u
sh:
avoid
s
uggestin
g
"m
e
rging" remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
o
h
n Ke
e
ping
g
it-config(1): clarify
precedence
o
f
mult
i
p
l
e values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keepin
g
git-con
f
ig:
u
pda
t
e doc
for --get w
i
th multiple value
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
com
p
letion:
l
earn about --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
completio
n
: han
d
l
e
unstuck for
m
o
f base git optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn Keeping
f
a
st-impo
r
t: a
l
l
o
w
movi
n
g
t
h
e root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-impor
t
: allow l
s
or filecopy
of t
h
e r
o
ot tr
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
f
as
t
-impo
r
t: set valid mode on root
tree in
"
ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Keeping
t9
3
00: do
c
u
ment fa
s
t-i
m
port empty path
i
ssu
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
n
g
s
ubmo
d
u
le: drop the top-leve
l
r
e
quirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
rev-parse: add --prefix op
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule:
sho
w
full pa
t
h in erro
r
m
e
s
s
a
ge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keepin
g
t7403: add
m
i
ssi
n
g &
&
chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403:
modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Ke
e
ping
t
7
401
:
mak
e
indenta
t
ion consis
t
ent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
n
g
mergetool--lib: refactor {diff,merge}_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Docu
m
entation/Makefile
:
move infodir to be wit
h
other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn K
e
eping
Doc
u
me
n
t
ation
/
Make
f
i
le: fix
spaces
around assignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
Jo
h
n Keeping
a
d
d-
-
interactive
:
respect diff
.
algorit
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
J
o
h
n Keep
i
ng
git-
g
u
i: fix
file name hand
l
ing w
i
th non-
e
mpty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
Joh
n
Ke
e
pin
g
fet
c
h: don't try to
u
pdate unfetche
d
track
i
n
g re
f
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
d
ifftoo
l
: fix
dir-diff when file does no
t
exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keepi
n
g
m
e
rge-tree: handle directory/e
m
pty conflict c
o
rrectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
Jo
h
n
Keeping
t/Makefi
l
e
: don't define TEST_RESU
L
TS_DIRECTORY recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
cont
r
ib/subtree: don't delete remot
e
branches if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test
o
u
tput: r
e
spect
$
T
E
S
T_OUTPUT_
D
IRE
C
TORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t
/
Makefil
e
: remove smoke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn Keeping
m
erge-tre
e
:
fix
t
ypo in "both changed ide
n
tical
l
y"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John
K
eeping
t/Makefile:
fix r
e
s
u
l
t
handling with TES
T
_OUT
P
U
T
_
DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keeping
transpo
r
t-helper: add '
s
i
g
ned-ta
g
s' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transpor
t
-helper:
p
ass --si
g
ned
-
t
a
gs=w
a
rn
-
strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
Kee
p
ing
fast-export: a
d
d --s
i
gne
d
-tags
=
warn-str
i
p mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepin
g
t
/
te
s
t
-lib
.
sh: fi
x
TRASH_DIRECT
O
RY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John K
e
ep
i
ng
merge-tree: don't prin
t
entries t
h
at match "lo
c
al"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitremote-helpers(1): c
l
arify ref
s
pec behavio
u
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn Keep
i
ng
s
u
b
m
odule: print
g
raph
o
utput
next to subm
o
d
u
le log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn Ke
e
ping
diff: a
l
l
ow unst
u
ck arguments with --
d
i
ff-alg
o
rithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn Keeping
git-merge(1): document d
i
ff
-
algorithm op
t
ion t
o
mer
g
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
Keeping
bisect: avoi
d
s
igned integer
o
v
erflo
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keepi
n
g
diffco
r
e-break: don
'
t
d
ivi
d
e by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
e
ping
t7800: run -
-
dir-
d
iff tests with and
w
i
t
hout symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
e
ping
t7800: fix tests when
difftool uses
-
-no-
s
y
mlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepin
g
t78
0
0: don'
t
hide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
difftool: don
'
t overwrite modified
f
iles
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
t7800: mo
v
e '--s
y
mlinks' s
p
ecific test to
the en
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keepi
n
g
merge-tr
e
e: fi
x
typo in merge-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Kee
p
ing
refs
.
c: fix fread err
o
r
han
d
ling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
e
n
try: f
i
x filt
e
r lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t
2003: mode
r
niz
e
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
di
f
f
t
o
ol --
d
ir
-
d
i
ff: s
y
m
l
i
nk
all files m
a
tching
the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Ke
e
pin
g
d
i
ff
t
o
o
l: av
o
id double slashes in sy
m
link
targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
i
ng
git-di
f
ftool(1): fix formatti
n
g of --symlink description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
Jo
h
n Ke
e
pi
n
g
Revert "graph
.
c: ma
r
k
p
rivate fil
e
-scope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John K
e
epin
g
Makefile:
m
ake man
d
ir, htmldir and i
n
fodir absolut
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
r
e
bas
e
-i:
r
e
spect
c
o
re
.
comm
e
ntc
h
ar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn
K
eep
i
ng
combine-diff
.
c:
teach combined diffs abo
u
t line
p
refi
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
diff
.
c: use diff_
l
i
ne_pr
e
fix(
)
where
a
pplicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
e
eping
diff: ad
d
d
i
ff_
l
ine_prefix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n
Keepi
n
g
diff
.
c:
m
ak
e
const
a
nt st
r
ing arguments co
n
s
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n Kee
p
ing
dif
f
: w
r
ite
p
refix to the c
o
r
r
ect file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
Jo
h
n Keeping
graph: output
padd
i
ng for
me
r
g
e subseq
u
ent
p
arents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John K
e
eping
t4
0
3
8
: a
d
d tests for "di
f
f
--cc --
r
aw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n Keep
i
ng
built
i
n/apply: tighten (dis)s
i
m
i
larity index
p
arsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
m
e
rgetool--lib: list use
r
configur
e
d tools in
'
-
-
t
o
ol
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
ohn Keeping
Rename {gi
t
- =>
g
it}remote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
ohn K
e
eping
CodingGuidelines:
a
d
d
P
y
tho
n
c
oding guidelines
commit
|
commitdiff
|
tree
2013-01-28
John
Keeping
git-re
m
ote-test
p
y
:
f
ix path hashing
on Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
merget
o
o
l
--lib:
don't ca
l
l "
e
x
i
t
"
i
n setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Kee
p
in
g
g
it-di
f
ftool
:
use git-mergetool--lib
for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Ke
e
ping
git-me
r
ge
t
ool: don'
t
hard
c
od
e
'
m
e
rgetool' in
s
how_tool_h
e
lp
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
K
e
eping
git
-
mergetoo
l
:
r
e
m
ove
redun
d
ant assignme
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
i
ng
git-mergetoo
l
: move show_tool_help to merg
e
t
o
ol--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-rem
o
te-testpy: call p
r
i
n
t a
s
a
func
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
g
it-remote-
t
es
t
p
y
: d
o
n't d
o
u
n
buf
f
e
r
ed
t
ext I
/
O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git-remote-test
p
y: hash bytes explicit
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
s
vn
-
fe: allow svnrdump_s
i
m
.
py to
run with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_remot
e
_helpers
:
us
e
2to3
i
f
building wi
t
h Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
_remote_help
e
rs: f
o
rce rebuil
d
i
f pyt
h
on
version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
J
o
h
n
Keeping
git-cvsimport
.
txt: cvsp
s
-2 is depreca
t
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
J
o
hn Kee
p
ing
git-for-eac
h
-ref
.
txt: 'raw'
is
a suppor
t
ed date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John
K
eeping
g
i
t
_
rem
o
t
e_helpers: f
i
x i
n
p
u
t
w
hen
running under Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Kee
p
i
ng
git
_
remote
_
helpers: allow building
w
i
t
h
P
ython 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
J
ohn Keep
i
ng
git-svn: teach
f
ind-rev to find near matc
h
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fast-imp
o
rt
(
1)
:
reorganise options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fast-import(1)
:
combin
e
document
a
tion of --[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keepi
n
g
g
it-
s
hortlog(
1
)
:
d
o
cument
b
e
h
a
v
iour of zero-width wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
J
o
h
n
Keeping
git-fast
-
i
mport
(
1
)
: remove dupli
c
ate
'--do
n
e' option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John K
e
eping
D
ocumentation: don't link to example mai
l
a
ddresses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Keep
i
ng
rebase -i co
n
tinue: don't sk
i
p commits that only change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree