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 'jc/apply-ignore-whitespace' into maint
2014-05-27
John
Keeping
c
o
mpl
e
tion: a
d
d
m
issin
g
option
s
for git-merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
J
ohn Keeping
co
m
p
letion: add a note that merge
options
are sha
r
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John Keeping
bui
l
t
in
/
mv
:
fix out of
bounds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Ke
e
ping
b
uiltin/mv: don't use me
m
ory after free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf8:
u
se correct type
f
or values
in interv
a
l ta
b
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
oh
n
Keeping
u
tf8: fix icon
v
er
r
o
r
detection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Jo
h
n
K
e
e
ping
notes-
u
tils:
h
andle boolean notes
.
rewr
i
temode
c
o
rrectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John
Keep
i
ng
Make
f
ile: remove redundant obj
e
c
t in
g
it-http
{
f
etc
h
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
J
ohn Keeping
pu
l
l: su
p
pres
s
error wh
e
n no remoteref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John K
e
e
ping
completion:
ha
n
d
l
e --[no
-
]fork-point op
t
i
o
ns t
o
git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
Joh
n
Kee
p
ing
compl
e
tion: complete m
e
r
g
e-base
op
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John K
e
eping
re
b
ase
:
fix fork-point with zer
o
arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John
Keeping
rebase:
u
s
e reflog t
o
find
c
ommo
n
base wit
h
upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
Jo
h
n Keeping
pull
:
u
se
me
r
ge-
b
a
se
--f
o
rk-point when appropriat
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Joh
n
Keepi
n
g
peek-r
e
mote: remove
d
eprecate
d
alias of ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
lost-found
:
remo
v
e d
e
precated c
o
m
mand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
ta
r
-tree: remove
d
epr
e
cate
d
c
o
m
man
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
repo-config: rem
o
ve deprecate
d
a
lias for
"
git config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
Jo
h
n
Kee
p
ing
Documentation/Make
f
il
e
: make AsciiDoc dbla
t
ex
dir co
n
figurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keep
i
ng
merge-recu
r
s
i
ve: fix parsing of "dif
f
-algo
r
ith
m
" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Kee
p
ing
r
eset: hand
l
e su
b
modul
e
with trailing slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Joh
n
K
e
eping
r
m: re
-
us
e
pars
e
_p
a
th
s
pec'
s
t
r
ailing-
s
la
s
h removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Keeping
g
i
t_re
m
ote_helpe
r
s: remove little used
P
ython library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John K
e
eping
rev-parse(1): logi
c
al
l
y g
r
oup opti
o
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
r
ev-parse: rem
o
ve restrictions on some options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John K
e
epin
g
pull: change the description
t
o "integrate" ch
a
n
g
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
push: avoid su
g
gesting "mergin
g
"
remote change
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
git-con
f
i
g
(
1
): c
l
arify prece
d
e
nce of
m
ultip
l
e
va
l
ues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
J
o
h
n Keeping
git-
c
onf
i
g
:
upda
t
e doc for --get with mu
l
tiple v
a
lu
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Jo
h
n Keep
i
ng
c
ompleti
o
n: learn abo
u
t
--man-
p
ath
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Kee
p
ing
completio
n
: h
a
ndle u
n
stuck
form of ba
s
e
git
op
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Ke
e
ping
fa
s
t-im
p
ort: al
l
ow moving
t
he root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Ke
e
ping
fast-imp
o
rt
:
allow ls o
r
filec
o
py of
t
h
e root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-import
:
set
valid mod
e
o
n root tree i
n
"ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn
K
eepi
n
g
t930
0
:
do
c
u
m
ent fas
t
-import em
p
ty path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
submodule: drop the top-level requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn
K
e
e
p
ing
rev-parse: add --
p
re
f
ix
o
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
subm
o
dule
:
show ful
l
path in erro
r
m
e
ssage
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
t7403: add missing && chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t74
0
3: mod
e
rnize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
ng
t7401
:
make indentation consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
mergetool--
l
i
b: r
e
f
actor {diff,merge}_cmd l
o
gic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Docu
m
entation
/
Makefile: mov
e
infod
i
r
t
o
be
with oth
e
r
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepin
g
Docu
m
entatio
n
/Makefi
l
e: fix
s
pace
s
a
r
ound assignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
add--interactive: respect dif
f
.
algorit
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keepin
g
g
i
t-g
u
i: fix fi
l
e name handl
i
ng with non-em
p
ty
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John
K
eep
i
ng
fetch
:
don'
t
try to upda
t
e
un
f
e
t
ched trackin
g
r
efs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
Joh
n
Keeping
diff
t
ool: fix d
i
r-diff when
file d
o
es
n
ot exist
i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
m
erge-tree: hand
l
e dire
c
tory/em
p
ty confl
i
ct
c
o
rre
c
tly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keep
i
n
g
t/Makefile:
don't
define TEST_RE
S
ULTS_DIRE
C
TORY 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 remo
t
e bran
c
hes
if sp
l
it
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
J
o
h
n
Keeping
tes
t
output: resp
e
c
t
$TES
T
_OUT
P
U
T
_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Kee
p
ing
t
/
M
a
kefile: remove smo
k
e te
s
t targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn Keeping
merge-tree:
f
i
x
typ
o
in "bot
h
changed i
d
entic
a
lly"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keepin
g
t/Makefile: fi
x
result ha
n
dling wit
h
T
E
S
T_OUTPUT_DIRECTO
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
tr
a
ns
p
ort-he
l
p
e
r: add 'signed-tag
s
'
c
a
pability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
ng
t
r
a
nspor
t
-help
e
r:
pass
-
-signed-
t
ags=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepi
n
g
fast-e
x
port: add --signed-
t
ags=warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
Keeping
t/test-lib
.
s
h: fix TRASH_DIRECTORY
h
and
l
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
J
o
h
n
Keeping
me
r
ge-tree:
don
'
t print entries tha
t
match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitr
e
mot
e
-helpers(1): clarify r
e
fspec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keepin
g
s
u
bmodule: print graph output next
t
o
s
ubmodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
diff: allow
unstuck argum
e
nts
w
ith --diff-a
l
g
o
r
ithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keep
i
ng
git-merg
e
(1
)
: document
d
iff-algori
t
hm
o
pti
o
n to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
b
i
sect: avoi
d
signed integer overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
K
eep
i
ng
di
f
fcore-break: don't
d
ivide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: run --dir-diff tests wi
t
h and witho
u
t
s
ymlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keeping
t7800: f
i
x tests w
h
en difftool u
s
es --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
ee
p
ing
t7800: don't
hide
grep
o
utput
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
difftool: don't
o
verwrite
modi
f
ied
files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t
7
80
0
: m
o
ve
'-
-
sym
l
inks'
s
pec
i
fic test to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keep
i
ng
merge-tr
e
e: fix ty
p
o in merge-tree
.
c
:
:
u
nr
e
solved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
Jo
h
n Keeping
refs
.
c: fix
f
re
a
d error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
e
epi
n
g
entry: fix filt
e
r lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
t
2
003:
m
o
d
e
rnize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepin
g
difftool --dir-diff: symlink a
l
l fil
e
s matc
h
i
ng the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
d
i
ff
t
ool
:
avoid dou
b
le slas
h
es in sy
m
li
n
k targe
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
g
it-difftool(1): fix
f
orm
a
t
t
ing of
-
-sym
l
ink description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
Joh
n
Keeping
R
e
ver
t
"graph
.
c
:
mark
p
riv
a
te file-scope s
y
m
b
o
l
s as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
o
hn Keepi
n
g
Makefi
l
e: m
a
ke mandir, html
d
ir and
i
nfodir abs
o
l
u
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn
K
eeping
rebase -i: respect co
r
e
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Ke
e
ping
combine-
d
iff
.
c: teach combine
d
di
f
fs
ab
o
ut line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
d
i
ff
.
c
:
use diff
_
li
n
e_p
r
efix() where
app
l
ica
b
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
iff:
add
d
iff_lin
e
_prefix functi
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keepin
g
diff
.
c: make constant string arguments c
o
nst
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
diff: write prefix to the cor
r
ect file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
Joh
n
Keep
i
ng
g
r
aph: output
padding for
merge subsequent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t4038: add tests f
o
r "diff --cc --ra
w
<trees>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin/ap
p
ly: tighten (dis
)
sim
i
larity index par
s
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
K
eeping
mergeto
o
l--lib: list
u
ser configu
r
ed too
l
s i
n
'--
t
ool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
o
hn Keeping
Rename {git-
=> git}remote-hel
p
e
r
s
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John
K
eepi
n
g
CodingG
u
i
d
e
line
s
: add Pytho
n
coding
gui
d
elines
commit
|
commitdiff
|
tree
2013-01-28
John Ke
e
pi
n
g
git-remo
t
e-testpy: fix path has
h
i
n
g o
n
Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
J
ohn
Keeping
merg
e
tool--lib: don'
t
call "exit" in
setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
p
i
ng
git
-
di
f
ftool: use git-m
e
rgetool--lib fo
r
"--too
l
-help
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
g
i
t
-
mergetool: don'
t
h
ardcode 'merge
t
ool' in show_tool_he
l
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keepi
n
g
git-mergetool: re
m
o
ve red
u
ndant ass
i
gnment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-
m
erg
e
tool: move show_tool_help to mer
g
etool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn
Keepi
n
g
g
i
t-r
e
mote-testpy: call pr
i
nt as a f
u
nct
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
epi
n
g
git-remo
t
e-testpy: don
'
t d
o
unbuffered text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next