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
git.1: switch homepage for stats
2014-05-27
Joh
n
Keeping
c
o
m
p
leti
o
n:
a
dd missing optio
n
s for git-mer
g
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keepi
n
g
c
omp
l
e
t
ion: a
d
d
a
n
o
te
t
hat merge options are sha
r
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John Keeping
bu
i
lti
n
/mv: fix out of bounds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
o
hn Kee
p
ing
bui
l
tin/mv: don't
u
se memo
r
y after free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
ohn Keeping
utf8: use correct type
f
or v
a
lues in
i
nter
v
al
t
able
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf
8
:
f
i
x iconv
e
rror detection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
notes-utils: han
d
le boole
a
n notes
.
re
w
rit
e
mode correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John Keeping
Makef
i
le: remove r
e
dundant obje
c
t
in git-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
J
o
hn Keeping
pull: suppr
e
ss error
w
hen no remoteref is fo
u
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Kee
p
ing
complet
i
on:
han
d
l
e
-
-
[
no-]fork-
p
oi
n
t options t
o
git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John
K
eepi
n
g
comple
t
ion: comp
l
ete merge-base
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keeping
rebas
e
: fix
fork-poi
n
t with zero arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
r
e
base: u
s
e reflog to find common ba
s
e
w
ith upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keeping
p
u
ll:
u
se merge-base --f
o
rk-point w
h
en appropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
peek-remote:
remove
d
e
p
r
ecated alias of ls
-
remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
K
eeping
l
ost
-
f
o
und: remove depr
e
cated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
oh
n
Ke
e
ping
t
ar
-
tr
e
e
: remove deprec
a
ted command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Jo
h
n K
e
e
ping
r
ep
o
-co
n
fig: re
m
ove dep
r
ecate
d
alias
fo
r
"git c
o
nfig
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
J
o
h
n
Keep
i
n
g
D
oc
u
mentatio
n
/M
a
kefile: m
a
ke AsciiDoc
d
blatex dir
conf
i
gura
b
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John
K
e
ep
i
ng
merge-
r
e
c
u
r
s
ive: fix parsing of "di
f
f-alg
o
rithm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Joh
n
Keeping
reset:
h
andle submo
d
ule
w
ith t
r
ailing slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Joh
n
Keepin
g
rm:
re-us
e
parse_pathsp
e
c'
s
trailing-slas
h
rem
o
v
al
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Keeping
gi
t
_rem
o
t
e_helper
s
:
r
e
mo
v
e
little used Python library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev
-
parse(1): logically gr
o
up o
p
tions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
ohn K
e
eping
rev-parse: remove restric
t
i
o
ns
o
n
some op
t
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John K
e
e
ping
pull:
change th
e
d
escriptio
n
t
o
"integrate" chan
g
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
push: avoid
s
uggesting "merging" remote c
h
anges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
git-
c
onfi
g
(1): clarify preceden
c
e
of
m
ul
t
i
p
l
e
v
al
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
g
it-
c
onf
i
g: up
d
ate d
o
c for
-
-
g
et with m
u
ltiple
values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Jo
h
n
Keeping
com
p
l
et
i
on: learn abo
u
t --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
compl
e
tion: handle
un
s
tuc
k
form of base
git op
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Keeping
fast-import:
a
ll
o
w
moving the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n Keeping
fast-impo
r
t: al
l
ow ls or fi
l
ec
o
p
y 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: se
t
v
alid mode
on root tree in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Joh
n
Keeping
t9300: docume
n
t
fast-i
m
p
ort empty path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
s
u
bmodule: drop the t
o
p-level requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
rev-parse:
a
dd --prefix o
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
s
ubmo
d
ule: show full p
a
th in error messag
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403
:
add miss
i
n
g && chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Ke
e
ping
t7
4
03: modernize s
t
yle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eep
i
ng
t7401: make indentat
i
on consist
e
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keep
i
ng
mergetool--lib: re
f
actor {diff,merge}_c
m
d logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n Keeping
D
o
cumentation/Makefi
l
e: move
in
f
odir to be with ot
h
er
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keeping
Docum
e
ntatio
n
/Mak
e
file: fix spaces around
assig
n
ments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
Jo
h
n K
e
eping
add-
-
i
nteractive: respec
t
diff
.
algor
i
thm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Ke
e
p
i
ng
g
i
t-gui: fix file n
a
m
e
handling with
n
on-empt
y
pref
i
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
Jo
h
n
Keeping
fetc
h
: don't t
r
y to up
d
ate unfetched track
i
ng refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
Jo
h
n Keeping
dif
f
tool: fix dir-diff when file does not e
x
ist
i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-tree: handle
directory
/
empty
conflict cor
r
ectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
Jo
h
n Keeping
t/
M
akefile: don't define
T
EST_RESUL
T
S_DIRECT
O
R
Y
r
ecursi
v
ely
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
Joh
n
Keep
i
ng
con
t
r
ib
/
sub
t
ree: don
'
t delete remote branches i
f
split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test output:
r
e
s
pect $TEST_O
U
TPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Ke
e
ping
t/Makefile: remove
s
m
o
ke test t
a
r
g
ets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Joh
n
Keep
i
ng
mer
g
e-tr
e
e: f
i
x typ
o
i
n "bo
t
h changed identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Kee
p
i
ng
t/M
a
kefil
e
:
fix res
u
lt handling with T
E
ST_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
Keeping
transport
-
he
l
pe
r
: add
'
sign
e
d-t
a
gs' c
a
pability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
ng
trans
p
ort-
h
elper:
pass -
-
sig
n
ed-tags=wa
r
n-stri
p
to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Keeping
fast-export: add --signed-tags=wa
r
n-st
r
ip mo
d
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepin
g
t/t
e
s
t
-lib
.
sh: fix TRASH_DIR
E
CTO
R
Y
handlin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-tree: don't pri
n
t entrie
s
that match "local
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitre
m
ote-helpers(1
)
: clarify
re
f
s
p
e
c
b
ehaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
Keeping
submodule: print graph
o
utput
n
e
x
t
t
o
s
ubmodu
l
e log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
d
i
f
f: allow unst
u
ck argume
n
ts
w
ith --diff-algorit
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
git-merge(1): document d
i
f
f
-
algorithm opt
i
on to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keep
i
ng
bisec
t
:
a
void signed
integer overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
diff
c
or
e
-break: don
'
t divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
p
i
ng
t7
8
00:
run
--
d
ir-
d
iff tests with and without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7
8
00:
f
i
x t
e
sts whe
n
difftool uses --n
o
-
symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepin
g
t
7
800: don'
t
hide grep ou
t
put
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
d
i
fftool: don
'
t overw
r
ite modified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: move '--symlinks
'
specific test to
the
end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
Jo
h
n Keeping
m
erge
-
tree: fix typo in merge-tree
.
c
::
u
nr
e
s
o
lved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
Jo
h
n Keeping
refs
.
c: fix fread error han
d
ling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entry: fix filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn
K
eeping
t2
0
03: moderniz
e
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n
Keeping
d
i
f
ftool --dir-
d
iff: sym
l
ink all
f
il
e
s matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn
Keeping
d
if
f
tool: avoid d
o
ubl
e
slashes in
s
y
mlin
k
targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
g
i
t-difft
o
ol(1): fi
x
formatting of --sy
m
link description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John K
e
eping
Rev
e
rt "g
r
aph
.
c
:
mark
pr
i
vate file
-
s
c
o
p
e symbo
l
s a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
M
a
kef
i
le: make
m
andir, ht
m
ldir and
infodir abso
l
ute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
rebase -i
:
r
esp
e
c
t
core
.
commen
t
char
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
combin
e
-diff
.
c
:
t
e
ac
h
combined diffs about l
i
ne pre
f
ix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
i
ff
.
c
:
u
se diff_line_prefi
x
() wh
e
re applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: add
di
f
f_line
_
p
r
efix func
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
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
K
eeping
d
i
ff
:
write
p
r
efix
to the correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
grap
h
: output padding for merge subseq
u
ent par
e
nt
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keep
i
ng
t4038: add tests for
"
d
i
f
f --c
c
--raw <
t
rees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
hn
K
eeping
bu
i
ltin/apply
:
tigh
t
en (dis)s
i
milarity
index
p
arsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
mergetool
-
-
lib: list user configured tools i
n
'--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keep
i
ng
Renam
e
{git- => git}remote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
o
hn Keeping
Codi
n
gGuidel
i
nes:
ad
d
Python coding gu
i
del
i
nes
commit
|
commitdiff
|
tree
2013-01-28
Joh
n
Keeping
git-
r
em
o
te-tes
t
py:
fix path h
a
shing on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
mergetool
-
-lib:
d
on't ca
l
l "exit" in s
e
tup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
-di
f
ftoo
l
:
u
se git-
m
ergetool--
l
ib for "-
-
tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
gi
t
-mergeto
o
l: don't hardcode 'm
e
rgetool' i
n
show_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n Ke
e
ping
gi
t
-mergetool: re
m
ove redundant
assig
n
ment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git
-
m
e
rgetool: mov
e
show_tool
_
help
to m
e
rget
o
o
l
-
-l
i
b
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Ke
e
ping
g
it-remo
t
e-testpy: call print as a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote-tes
t
py: do
n
't do unbuff
e
r
e
d text I
/
O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next