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 'pb/trim-trailing-spaces' into maint
2014-05-27
John Keeping
comp
l
et
i
on: add missing options for git-merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
Jo
h
n
K
eeping
c
o
mpl
e
t
i
on: add a
n
ote th
a
t merge
opt
i
o
ns are shared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John Keeping
builtin/mv: fix out of bounds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
o
hn Keepin
g
builtin/mv:
d
on't use memory after fre
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Ke
e
pin
g
u
t
f
8
: use correct type fo
r
valu
e
s
i
n interval tabl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf8: fix iconv error detection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
notes-utils: handle
bo
o
lean notes
.
rewrit
e
m
ode correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
J
o
hn Keeping
Mak
e
file: rem
o
ve r
e
d
u
ndant
o
bject
i
n git-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John Kee
p
i
ng
pull: sup
p
r
e
s
s error
w
h
en
no re
m
o
teref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
completion: handle --[no-]fork-
p
o
int option
s
t
o
gi
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
completion: complete merge-
b
a
se options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
J
o
hn Keepin
g
reb
a
se: fix fork-poin
t
w
ith zero
arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
r
e
base: use ref
l
og t
o
fin
d
common ba
s
e with upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
Jo
h
n Keeping
pull:
use merge-
b
ase --fork-po
i
nt when
a
p
propriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
Ke
e
pi
n
g
p
e
ek-r
e
mote: re
m
ove deprecated alias of l
s
-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
lost-found: remove d
e
precated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Ke
e
ping
tar-tree: r
e
move deprecated
comma
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Kee
p
ing
repo-config: remove deprecated ali
a
s
for "g
i
t
config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
J
ohn Ke
e
ping
Docume
n
tation/
M
a
kefile:
m
a
ke
A
scii
D
oc
dblatex dir conf
i
gurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
J
ohn Kee
p
ing
merge-r
e
cursive: fix pars
i
ng of "di
f
f
-
algorit
h
m" opt
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Joh
n
Keeping
reset: handle sub
m
odule with trai
l
ing slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keep
i
ng
rm:
re-use par
s
e_pathspec's
t
railing-slash
r
emoval
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Kee
p
ing
git_
r
e
mote_helpe
r
s: r
e
m
o
ve little used Python library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
r
ev-parse(
1
): logicall
y
group opt
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-parse
:
remov
e
restr
i
ctions on
some options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
Jo
h
n
Keeping
pull: ch
a
nge the de
s
c
ription
to
"integ
r
ate" cha
n
ges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Jo
h
n K
e
eping
push
:
avoid sug
g
esti
n
g
"m
e
r
g
ing"
r
emot
e
change
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
K
e
eping
git-config(1
)
: cl
a
rify
p
re
c
ed
e
n
c
e of m
u
lt
i
ple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keepi
n
g
git-config: up
d
ate do
c
for -
-
get with multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John K
e
epi
n
g
completion:
l
e
ar
n
about --m
a
n-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Kee
p
ing
compl
e
tion: handle
unstuck form of base
git options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
h
n
K
eepi
n
g
f
ast-import: al
l
ow
moving t
h
e root
tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
f
ast-impor
t
: all
o
w ls
o
r f
i
lecop
y
of the r
o
o
t
tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Joh
n
Keeping
fast-i
m
port:
s
et
valid mode on root tree
in "ls
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John K
e
eping
t9300: document fast-impor
t
e
m
pty path i
s
sues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule:
dro
p
the
top-level r
e
quirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
rev-p
a
r
s
e: add --prefix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
subm
o
dule:
s
how fu
l
l p
a
th in error
m
ess
a
g
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keeping
t7403
:
add missin
g
&&
c
haining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
ee
p
i
n
g
t7
4
03: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keepin
g
t7401: ma
k
e
inden
t
ation co
n
sistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
e
e
ping
me
r
getool--
l
i
b: refactor {d
i
ff,merge}_cmd l
o
g
i
c
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Do
c
u
m
entati
o
n/
M
akefile: move infodir to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Documentati
o
n/Makefile: f
i
x spaces
ar
o
und assignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
Jo
h
n
K
eeping
a
d
d
-
-interactive:
respec
t
diff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Kee
p
ing
git-
g
ui: fix
f
ile name
h
andl
i
ng with non-empty
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 u
p
date un
f
e
tched t
r
a
c
k
i
ng refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
J
ohn Keepi
n
g
difftool:
fix dir-diff when file does n
o
t exist
i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
Jo
h
n
K
eep
i
n
g
m
erge
-
tr
e
e
:
han
d
le
d
ire
c
tory/empty conflict
c
o
r
re
c
tly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keep
i
ng
t/Makef
i
le: don't define
T
E
S
T
_R
E
S
ULT
S
_DIRECTORY recursi
v
el
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
c
o
ntrib/subtree: don't
d
e
lete remote
br
a
nch
e
s if
spli
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
t
e
st outp
u
t: respect $TEST_OUTPUT_DIRE
C
TORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefile: remove smoke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Ke
e
ping
merge-tree: fix typ
o
in "both changed identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keepi
n
g
t/Make
f
ile: fix res
u
lt hand
l
i
ng with TEST_OU
T
PUT_DIRECTO
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
e
p
i
ng
trans
p
ort-helper: ad
d
'sign
e
d-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepin
g
transport-helper: pass
--sign
e
d-tags=wa
r
n-
s
trip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Keep
i
ng
fast-exp
o
r
t:
a
dd --signed-tag
s
=wa
r
n-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
/test-lib
.
sh: fix
T
RASH_DIRECTORY han
d
lin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge
-
tree: don't pr
i
nt e
n
tries that match
"local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
J
ohn Ke
e
pin
g
g
i
tr
e
mote-
h
elpers(
1
): clarify
r
e
f
s
p
e
c behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eepi
n
g
s
u
bmodule: print graph output next to submod
u
l
e
lo
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
diff: al
l
o
w u
n
stuck arguments
w
ith --diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn Keeping
git-merge(1): docu
m
e
nt
d
i
f
f-algorit
h
m
o
ption to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bi
s
ect:
a
void s
i
gned integer overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Keeping
d
iffcore-break:
d
on't
di
v
ide by ze
r
o
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keeping
t7
8
00: r
u
n --dir-diff tes
t
s wi
t
h and wi
t
hout syml
i
nks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keeping
t7800: fix
tests when difftool uses --no-sy
m
li
n
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keeping
t7800: don't hide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
difftool: don't ov
e
rwr
i
te
m
odi
f
ied fi
l
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
t7800: move '
-
-s
y
mlin
k
s
'
specific test to t
h
e end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
ohn Keepin
g
merge-t
r
ee: fix typo in merge-t
r
e
e
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
Jo
h
n
Keeping
r
efs
.
c: fix fread error
h
andl
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn K
e
epi
n
g
ent
r
y: fix f
i
lter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keepin
g
t2003: modernize
s
t
y
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
dif
f
too
l
--di
r
-diff: symlin
k
all files
m
atching
t
he
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool: a
v
oi
d
double
s
lashes i
n
sym
l
ink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-
d
ifft
o
ol(1)
:
fix
f
o
rmatting of --sym
l
ink des
c
ri
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
Jo
h
n Keeping
Revert "grap
h
.
c: mark pr
i
v
a
te file-scope symbols
as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
o
hn Keepin
g
M
a
k
efile:
ma
k
e mandir,
h
tmldir and infodir ab
s
olute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
rebase -i: respe
c
t cor
e
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Ke
e
p
i
n
g
combine-diff
.
c: teac
h
combin
e
d diff
s
about
l
i
n
e pre
f
ix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
diff
.
c: u
s
e
d
iff_line_prefix() where ap
p
licable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
epin
g
diff: add diff
_
line_prefix f
u
nction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
epin
g
diff
.
c: make cons
t
ant string arg
u
ments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
:
write prefix to t
h
e correc
t
file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
Joh
n
Keepi
n
g
graph: output
padding
f
or merge subseq
u
ent p
a
r
e
nts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
o
hn
K
ee
p
ing
t40
3
8: add tests for "diff --cc --raw <
t
r
e
es>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Kee
p
ing
builti
n
/apply
:
tighte
n
(dis)similarity index
p
ar
s
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
mergetool--l
i
b: list user con
f
ig
u
red tools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keepin
g
Rename {git
-
=> g
i
t}rem
o
te-helpers
.
t
x
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Ke
e
ping
CodingGuid
e
l
i
n
es: add Py
t
h
o
n c
o
ding guidelines
commit
|
commitdiff
|
tree
2013-01-28
J
ohn
Keepin
g
git-remot
e
-testp
y
: fix pat
h
hashing on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John
Keep
i
n
g
mergeto
o
l--l
i
b: don'
t
ca
l
l "e
x
i
t" in setup_t
o
ol
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keep
i
ng
g
i
t-d
i
f
f
tool: use git-mergetoo
l
-
-li
b
for "--tool-he
l
p"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git-mergetool:
d
on't ha
r
dco
d
e
'mergetoo
l
'
in show_tool_he
l
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
git-m
e
rgetool: remove redundan
t
ass
i
gnment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mer
g
etool: move sho
w
_tool_help to mer
g
etool-
-
lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git-remote-testpy: cal
l
print as a functi
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-r
e
m
o
t
e
-te
s
tpy:
d
on'
t
do unbuffered text I
/
O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next