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
parse_object_buffer: do not set object type
2014-05-27
John
Keeping
completion: add missing
options for git-
m
erge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
Jo
h
n Keeping
completion
:
a
d
d a note t
h
at merge o
p
t
i
o
ns
are sha
r
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John Ke
e
ping
builtin/
m
v:
fix ou
t
o
f
bounds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Kee
p
ing
bui
l
t
i
n
/mv: don't use
m
emory after
f
ree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keep
i
n
g
utf8: use corre
c
t type for values i
n
interva
l
table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Kee
p
in
g
u
tf8: fix i
c
onv e
r
r
or de
t
ection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
ohn Keeping
n
otes
-
utils:
handle boolean
n
o
tes
.
rewr
i
tem
o
de correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John
K
eeping
Makefile: remove
r
e
dundant object
in git
-
http{
f
e
t
c
h
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
J
ohn Keeping
pull: suppress error whe
n
no remotere
f
is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John
K
ee
p
ing
completion: handle --[no-]
f
ork-point
op
t
ions
to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
completion: comp
l
ete merge-bas
e
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Kee
p
ing
reb
a
se
:
fix fork-point with ze
r
o arg
u
ments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John K
e
eping
reba
s
e:
u
se ref
l
og
to
find
com
m
on base w
i
th upstre
a
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keeping
p
ull
:
use m
e
rge-
b
ase --fo
r
k-point w
h
en appropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Jo
h
n
Keeping
peek-remote: remove depre
c
ated al
i
as of
l
s-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
Keeping
l
o
st-fo
u
nd: remo
v
e d
e
precated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Joh
n
Keepi
n
g
tar-t
r
ee: remo
v
e deprecated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keepi
n
g
repo
-
config:
remove depre
c
a
t
ed
alias for "git conf
i
g"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
Documentation/Makefile:
m
ake AsciiDoc dblat
e
x dir c
o
n
figurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John K
e
eping
merge-recur
s
ive:
fix
p
arsin
g
o
f
"diff-alg
o
rithm" o
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keepi
n
g
reset: hand
l
e
submodule with
trailing slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keepin
g
rm: re-use parse_pathspec
'
s trailing-slash
r
emoval
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
n Keeping
git_remote_helpers: remove litt
l
e use
d
P
y
t
hon l
i
brar
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-parse(1): log
i
cally
g
roup options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Kee
p
ing
rev-
p
arse: remove restri
c
tions on some
o
ptions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keepi
n
g
pull
:
ch
a
n
ge the description to "integrate" ch
a
n
ges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Jo
h
n
Kee
p
ing
p
u
s
h
:
avoid
s
ugge
s
ti
n
g
"merging" remote c
h
anges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John K
e
eping
git-config(1): clarify precedence
o
f
mul
t
ip
l
e values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Kee
p
ing
g
i
t
-
c
onfig: update doc
f
or --ge
t
wit
h
multi
p
le
v
alue
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
ohn Keeping
com
p
letion: learn about
--m
a
n-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
comp
l
etion
:
han
d
le unstuck form
o
f
base git
o
p
tions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
eeping
fast-import:
allow moving the ro
o
t tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
f
a
st-import:
a
llow ls or f
i
lecopy of the r
o
ot tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
Keeping
fast-
i
m
p
ort: set v
a
lid mod
e
on root
tree
i
n "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t9300: do
c
um
e
nt fast-i
m
po
r
t
empty pa
t
h iss
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
submo
d
u
l
e: drop the top-lev
e
l r
e
quirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
rev-par
s
e:
a
dd --prefix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
e
p
i
ng
submodu
l
e: show fu
l
l pat
h
in e
r
ror message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
ng
t7403: add
missing && chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Ke
e
ping
t7403
:
modern
i
z
e
s
tyle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7401: make inde
n
tation consiste
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
mer
g
etool--lib
:
re
f
act
o
r {diff
,
m
erge}_
c
m
d
logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
Documentatio
n
/
Makefile: move infodir to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Documen
t
atio
n
/Makefile: fix spaces ar
o
u
nd
assignm
e
nt
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Kee
p
i
ng
add
-
-in
t
e
ractive: respect
diff
.
alg
o
rit
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keepin
g
gi
t
-gui:
f
i
x file name handlin
g
with n
o
n-emp
t
y prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
f
e
tch
:
don't t
r
y to update unfetched tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Kee
p
ing
difftool:
fix dir-diff whe
n
f
ile d
o
es not
exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
Jo
h
n Keepin
g
merge-tree: h
a
nd
l
e director
y
/
empty conflict co
r
rectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John K
e
eping
t/Make
f
ile
:
don't
d
efine TEST_RE
S
ULTS_DIR
E
CTORY recursivel
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
contrib/sub
t
ree: don'
t
d
e
lete remote branch
e
s if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test
output: respect $TEST
_
O
U
TPU
T
_DIR
E
CTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
ohn Keeping
t/Ma
k
e
fil
e
: r
e
move s
m
oke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merge
-
tree
:
fix typo in "
b
oth changed iden
t
ica
l
ly"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John
Keeping
t/Mak
e
fi
l
e: fix resul
t
h
a
n
d
l
i
ng with TEST_OUTPUT_
D
IRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
Keeping
transport-h
e
l
per:
add
's
i
gned-tags' capa
b
i
l
ity
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eeping
t
r
an
s
port-helper: pass --signed-
t
ags=wa
r
n-s
t
r
i
p to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
ing
fast-export: add
-
-sign
e
d-t
a
gs=warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepi
n
g
t/test-lib
.
sh: fix
T
RASH_DIR
E
CTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John K
e
eping
merge-
t
r
ee: don't print e
n
tr
i
es that match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John
K
e
e
p
ing
gitremote-helpers(1):
c
larify refspec behav
i
our
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keep
i
ng
submo
d
ule:
p
rint gra
p
h ou
t
put next
t
o subm
o
d
ule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn Keeping
diff: allow unstuck
a
rguments with --d
i
ff-algorit
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Ke
e
ping
g
i
t-merge(
1
): document di
f
f
-
a
lgorit
h
m
o
p
tion to
m
e
r
ge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
ohn Keepi
n
g
bisect: avoid s
i
gned inte
g
er overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
ohn Keeping
di
f
fcore-b
r
e
a
k: don
'
t
divide
by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keep
i
ng
t7800: run --dir-d
i
ff tests with
a
n
d
w
ithout sym
l
inks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: f
i
x tes
t
s when difftool us
e
s --no
-
sy
m
links
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
t
7
800: don't hide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
d
iff
t
ool:
d
on't overwrite m
o
dified fi
l
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keep
i
ng
t780
0
: move '--symli
n
ks' specific
test to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
m
er
g
e
-
tr
e
e: fix
t
ypo in merge-tre
e
.
c:
:
unreso
l
ved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c: fix fread error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eeping
entry: fix filte
r
looku
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepin
g
t
2
0
0
3
: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
d
i
f
f
too
l
-
-dir-dif
f
: symlink a
l
l files ma
t
ching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eeping
dif
f
to
o
l:
a
void double
slas
h
es in
symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-difftool(1): fix forma
t
ting of --sy
m
link
d
e
s
cr
i
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
J
ohn Keepin
g
Revert
"
gra
p
h
.
c: mark private file-scope symbols
as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
ohn Keeping
Make
f
ile: make mand
i
r, htmld
i
r and in
f
odi
r
ab
s
olute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keepin
g
rebase -i: respe
c
t cor
e
.
commentc
h
ar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
combine-d
i
ff
.
c: te
a
ch c
o
mbi
n
e
d
diffs about l
i
n
e
p
refix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
diff
.
c
: use diff_line_prefix() wher
e
applic
a
ble
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: add diff_line_
p
refix functio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
di
f
f
.
c
:
make constant string argu
m
ents co
n
st
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keepin
g
diff:
write
p
refix to the cor
r
ect file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keep
i
ng
graph: output padding
for
m
erge subs
e
quent parent
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Kee
p
ing
t4038:
a
dd tests for "
d
iff
-
-cc
-
-r
a
w <trees>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n Keepi
n
g
builti
n
/appl
y
: tighten (dis
)
simi
l
arity index
p
a
r
sing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keep
i
ng
mergetool--lib: li
s
t user confi
g
ured
t
ools in '-
-
tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keep
i
ng
Rename {git- => git}re
m
ote-
h
e
lpers
.
tx
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John
K
e
e
ping
Codin
g
Guidelines: ad
d
Python coding guideli
n
es
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git
-
r
e
m
o
t
e
-testpy: fix path
hash
i
ng on Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John
Keeping
mergetool--lib: don't call "exit" in
setu
p
_
t
o
o
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eepin
g
git-dif
f
tool:
u
se git
-
m
erg
e
too
l
--li
b
fo
r
"--
t
o
o
l-he
l
p
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
gi
t
-
m
ergeto
o
l: don't h
a
r
d
code
'mergeto
o
l' i
n
s
how_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Kee
p
ing
git-merge
t
ool: remove redu
n
da
n
t ass
i
gnment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git-mergetool: move
s
how_tool_hel
p
to mergetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
git-remote-
t
estpy:
c
all print as a
f
unction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t
-
remote-testpy
:
don't d
o
u
nbuffer
e
d text
I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next