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
completion: add a note that merge options are shared
2014-05-27
Jo
h
n Keeping
completion: add a not
e
th
a
t
merge options are s
h
ared
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-03-11
John Keeping
builti
n
/m
v
:
f
i
x out of bounds w
r
ite
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
Jo
h
n Kee
p
ing
builtin/mv: don
'
t
u
se memory
after free
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf8: use correct type
f
or values in interval table
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
John
K
e
eping
utf8: fix ic
o
nv
e
rror de
t
ection
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
John
K
eeping
notes-u
t
ils: ha
n
d
le bo
o
le
a
n notes
.
rewritemod
e
correct
l
y
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-27
John K
e
ep
i
n
g
Makefile: remo
v
e redundant obje
c
t in git
-
h
t
tp{fetch
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-17
John Keep
i
n
g
p
ull: su
p
press
error when
n
o remoteref is f
o
und
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-13
John
K
e
e
ping
c
o
mpletion:
h
andle --[no-]fork-p
o
int options to git
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-13
John Keepi
n
g
completion:
c
o
m
ple
t
e merg
e
-base o
p
tions
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-09
John Keepi
n
g
rebase
:
fix
f
o
rk
-
poi
n
t
w
i
th zer
o
arg
u
ments
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-12-10
John
Ke
e
ping
rebase: use
r
e
f
lo
g
to find common ba
s
e with upstream
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-12-09
John Keeping
p
ul
l
: us
e
merge-base --fork-poin
t
whe
n
a
ppr
o
pri
a
te
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John Keepi
n
g
peek-rem
o
te:
r
e
move deprecat
e
d a
l
ias of
l
s-remote
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn Keep
i
n
g
lost-found: remove deprecated c
o
mmand
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John Keepin
g
tar-tree: remove de
p
re
c
ated command
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John
Kee
p
ing
repo-config:
r
emove deprecated ali
a
s
f
or "git co
n
fig
"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-10-03
J
o
hn Keeping
D
oc
u
mentation/Mak
e
f
i
le: make AsciiD
o
c d
b
latex dir configu
r
a
bl
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-26
John Keep
i
ng
merge-recursive: fix parsing of "diff-al
g
o
rit
h
m" opt
i
o
n
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-13
John
Kee
p
ing
reset: h
a
ndle submod
u
le with trailing slash
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-13
J
o
h
n Keeping
r
m:
r
e
-
u
se
p
ar
s
e_pathspec
'
s t
r
ailing-slash
re
m
o
v
al
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-09
J
ohn Keep
i
ng
gi
t
_remote_hel
p
e
r
s: remove
little used Python libra
r
y
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-22
John
Ke
e
ping
rev-parse(1): logic
a
lly
g
roup o
p
tion
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-pars
e
:
remove restrict
i
on
s
o
n some options
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pull: chang
e
th
e
d
e
scription to "integrate" c
h
anges
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
John Keep
i
ng
push: avo
i
d su
g
g
e
sting "
m
erging"
r
emote changes
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
git-config
(
1)
:
clarify precedence
of multiple values
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-03
J
o
hn Keeping
git-config: update doc for
-
-
get with mult
i
p
le v
a
lue
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-30
John
K
eeping
completion
:
learn
a
bout -
-
man-path
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-30
John Kee
p
ing
complet
i
on: handle unstuck
f
orm of base git
options
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
Joh
n
Keeping
fast
-
import: allow moving t
h
e roo
t
tree
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Keeping
fa
s
t-i
m
port:
allow ls
o
r
filecop
y
of
t
he
r
oot tre
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John K
e
eping
fast-import: set vali
d
mode on
r
o
ot tree
i
n
"ls"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t9300: do
c
ument
f
a
st-im
p
ort emp
t
y
path issues
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n Keeping
su
b
m
o
d
u
l
e
:
drop th
e
top-le
v
el requireme
n
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Ke
e
pin
g
r
ev-par
s
e: add --prefix
opti
o
n
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
submodule: sh
o
w full path in error m
e
ssage
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John
Ke
e
ping
t7403: add
m
issing
&
& chaining
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n
K
e
e
ping
t7403: mod
e
rnize style
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7401: make indenta
t
ion consistent
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
merg
e
tool
-
-
l
ib: refactor {dif
f
,merge}_cmd logic
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
Doc
u
mentation/Makefi
l
e: m
o
ve infodir to be wit
h
other
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Docume
n
tati
o
n/
M
akefile: fix spac
e
s ar
o
und assignments
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-12
Joh
n
K
e
e
ping
add--i
n
teractive: r
e
sp
e
ct diff
.
algorithm
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-07
John K
e
eping
git-gui
:
fi
x
file name handling
with non-empty p
r
efix
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-28
John Keep
i
n
g
fetch: don't try to
up
d
ate unfetch
e
d trac
k
ing
r
e
f
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-17
Jo
h
n K
e
eping
difftoo
l
: fix
d
ir-di
f
f when file does not exist in
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-07
John Keepin
g
m
erge-
t
ree:
handle direc
t
ory/empty
c
onfli
c
t correc
t
ly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t
/
Makefile: don't define T
E
S
T
_RESUL
T
S_DI
R
ECTORY recursiv
e
ly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-01
John Keep
i
n
g
contrib
/
s
u
btree
:
don't delete
r
e
m
o
te branches if spl
i
t
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-29
John Keep
i
ng
t
e
st output: respect $TES
T
_
OUTPUT_DIRECTORY
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
Jo
h
n Keeping
t/M
a
k
e
file
:
r
e
move smok
e
test targets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
J
oh
n
Keeping
merge-tree: f
i
x t
y
po in "both
changed
i
den
t
ically"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-27
Joh
n
K
e
eping
t
/M
a
ke
f
i
le:
fix result handling
w
i
th TES
T
_OUTPUT
_
D
I
R
ECT
O
RY
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n
K
ee
p
ing
transp
o
rt-he
l
pe
r
: add 'signed-
t
ags' capability
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keepin
g
trans
p
ort-helper:
p
a
ss --
s
igned-tag
s
=warn-st
r
ip to
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keepin
g
fast
-
e
x
po
r
t: add --s
i
gned-tags=warn-strip mode
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keepi
n
g
t/te
s
t-lib
.
sh: fix TRASH_DIRECTOR
Y
han
d
l
in
g
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-08
John
K
e
eping
mer
g
e
-tree: don'
t
prin
t
e
n
tries
t
hat match "local"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
g
i
tr
e
m
o
te-hel
p
e
rs(
1
):
cl
a
r
ify refspe
c
behaviour
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n Keeping
submodule: print graph output next
t
o s
u
bmodule lo
g
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John Ke
e
ping
diff: a
l
low
un
s
tuck
a
rguments
with --
d
iff-al
g
o
rithm
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
Keeping
git-merge(1): d
o
cument diff-algorithm
option to merge
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisect:
a
void signed i
n
teger overf
l
o
w
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Keep
i
ng
diffcore-break: do
n
't divi
d
e by zero
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
t7800: run --di
r
-diff t
e
sts
with and w
i
thout
symlinks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keepi
n
g
t
7800: fix tests when
difftool uses --no-symlinks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keep
i
ng
t7800: don't hide grep out
p
u
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
difftool:
d
o
n
't ov
e
rw
r
ite modifi
e
d
f
i
l
es
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
t7800: mo
v
e '--symlinks' sp
e
cific te
s
t to
t
h
e e
n
d
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
me
r
g
e
-tree: fix
typo in mer
g
e-tree
.
c::unre
s
ol
v
ed
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-24
J
o
hn Keeping
refs
.
c: fi
x
fread
e
rror
h
a
n
dling
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
en
t
ry
:
fix filter lookup
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John
K
e
eping
t200
3
: modernize style
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
J
o
h
n
Kee
p
ing
dif
f
t
o
ol --di
r
-diff: symlink
a
ll
f
iles match
i
ng the
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
diffto
o
l: avoid d
o
uble
slashes
in
s
ymlink targe
t
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
git-difftool(
1
): fix form
a
tting of --symlink descri
p
tion
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-04
J
ohn K
e
e
p
ing
Revert "g
r
aph
.
c: mark private file-
s
cope
s
ymbols as
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-25
John Ke
e
p
i
ng
Make
f
ile: make m
a
ndir, htmldir and infodir absolute
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
r
e
b
a
se
-
i: res
p
ect co
r
e
.
commentchar
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
p
i
n
g
combine-diff
.
c:
teach combined diff
s
about
l
ine prefix
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
pin
g
diff
.
c: use diff
_
line_prefix() where appl
i
cable
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
diff:
a
dd diff_line_pr
e
fix f
u
nct
i
on
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
dif
f
.
c: make
const
a
nt st
r
ing
a
rgument
s
const
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eeping
diff: write prefix to the correct
file
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-07
John Keepi
n
g
graph: output
padding for merge subseque
n
t
parents
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-05
John Ke
e
p
i
ng
t4038: add tests f
o
r "diff --cc -
-
raw <trees>"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John Keep
i
n
g
builtin/app
l
y: ti
g
hten (di
s
)
s
imilarity index parsin
g
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
mer
g
etool--lib: list user configure
d
t
oo
l
s in '-
-
tool
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-01
Joh
n
Keep
i
ng
Rename {gi
t
- => git}remote-hel
p
ers
.
txt
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
Coding
G
u
idelines: add Pytho
n
cod
i
ng guidelines
commit
|
commitdiff
|
tree
2013-01-28
John
K
eeping
g
it-r
e
mo
t
e
-
testpy: fix path hashing on
P
ytho
n
3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-28
Jo
h
n Keeping
m
ergetool--lib:
d
on't call "
e
xit" in setup_tool
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
git-d
i
fftool: use
gi
t
-
mergetool--lib for "--tool-help"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keep
i
ng
git-merg
e
tool:
d
on't
h
ardcode
'
mergetool' in sh
o
w_tool
_
help
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t-me
r
getool: remove redund
a
nt
a
ssi
g
nmen
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git-me
r
ge
t
ool:
m
ov
e
sho
w
_tool_help
to mergetool--l
i
b
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
K
e
ep
i
ng
git
-
remote-testpy: call
p
rint as a functio
n
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git-remote-t
e
stpy:
don't do unbuffe
r
e
d
te
x
t I/O
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote-testpy: hash
b
ytes explicitl
y
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
next