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 'jk/clone-dissociate' into maint
2015-03-31
John Keeping
streaming
.
c
:
fix a memleak
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Keeping
c
ompletion: com
p
lete `
g
it push -
-
force-w
i
t
h
-lease=`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Keeping
completion: add some missing options to `git
p
ush`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John K
e
e
p
ing
c
o
mpletion: co
m
ple
t
e "unstuck"
`gi
t
pu
s
h
--r
e
curse
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
Jo
h
n Keeping
rebase: omit p
a
t
ch
-
identical commits with --fork-poi
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
John Keepin
g
rebase--am: us
e
--
c
herry-pick instead of --ig
n
ore-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Kee
p
ing
completion:
a
d
d miss
i
ng
options fo
r
git-merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
completion: add a note that merge options are shared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John Keeping
bui
l
tin/mv:
f
i
x out of bound
s
w
rite
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Kee
p
ing
builtin/mv: do
n
'
t use memory
a
fter
free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John
K
e
eping
utf8: u
s
e correct type
f
or va
l
ues in inter
v
al table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Jo
h
n Keepin
g
utf8: fix i
c
o
nv error detection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
ohn Kee
p
ing
notes-utils: han
d
le boo
l
ean
n
otes
.
rewrite
m
ode
c
orrectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John
K
eeping
Makefi
l
e:
r
e
move redundant o
b
ject in git-http{fetc
h
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
Joh
n
K
ee
p
ing
pull:
suppre
s
s error
when no re
m
oter
e
f is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Kee
p
ing
completion: handle --[n
o
-]fork-point options to gi
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John
K
eeping
completion
:
complete merge-b
a
se
o
ptio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
Jo
h
n Keeping
rebase: fix fork-poi
n
t with
zero arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Ke
e
ping
rebase: use reflog to fin
d
c
o
mmon base with upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keeping
pu
l
l: use merge
-
base --fork-poi
n
t when a
p
propriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
peek
-
remote: remove deprecated alias of ls-r
e
mote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Joh
n
Keeping
lost-found: remove depre
c
a
t
ed command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Keep
i
n
g
tar-tree: remove deprecated
c
o
m
mand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
h
n K
e
epin
g
r
epo-config:
r
e
m
ove
d
eprec
a
t
e
d alia
s
fo
r
"git
c
on
f
ig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John
K
eep
i
ng
Doc
u
men
t
ation/Makefile:
m
a
k
e
AsciiDoc dblatex di
r
configu
r
a
b
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
merge-recursive:
f
ix parsing of "di
f
f-algorithm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
reset
:
handle s
u
bmodule with trailing slas
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm: re-use parse_pathspec's trailin
g
-
s
l
a
sh removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
J
o
h
n
Keeping
git_remote_h
e
lpe
r
s: remove littl
e
used Python library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keep
i
ng
rev-par
s
e
(
1): logica
l
ly
gr
o
up opt
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-parse: remove
restrictions
on some options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
Joh
n
Keep
i
ng
pul
l
: change the descriptio
n
t
o "integrate" cha
n
ges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
push: avoid s
u
gge
s
ti
n
g "merging
"
remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
git
-
config(1): clarify
p
recedence of m
u
ltiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
J
o
hn
K
eeping
git-config: update doc for --get
wi
t
h multipl
e
values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
completion: learn a
b
out --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
ohn Keep
i
ng
c
om
p
letion: handle unstuck f
o
rm of b
a
se
g
i
t op
t
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
h
n K
e
eping
fast-import: al
l
ow moving the
roo
t
tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keepi
n
g
fast-import: allow l
s
or filecopy of th
e
root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
h
n
Keeping
fast-import:
s
et valid
m
ode on root tre
e
in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keepin
g
t
9
3
00: document fast-import empty path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn
K
e
eping
s
ubmodu
l
e:
dro
p
the top
-
level requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n Keepi
n
g
r
e
v-parse
:
a
dd
-
-prefix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n
Keepi
n
g
subm
o
dule: s
h
ow
f
u
ll path in e
r
ro
r
message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
ng
t7403: add missing && cha
i
n
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t
7
40
3
:
m
odernize styl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Kee
p
ing
t7401: mak
e
i
nd
e
ntat
i
on consi
s
tent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
mergetool-
-
lib: refactor {diff,
m
erg
e
}_c
m
d
lo
g
ic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
e
e
ping
Documentation/M
a
kefile: move
i
n
f
o
dir
to be
w
ith other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Documentation/Make
f
ile:
f
ix spaces ar
o
und assignme
n
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
Joh
n
Keeping
add--i
n
teractive: respect diff
.
algor
i
thm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keeping
git-gui
:
f
ix file name handling with
non-em
p
ty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
f
e
tch: don't
try t
o
update unfetched t
r
acking ref
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
dif
f
to
o
l:
fix
dir-diff w
h
en file
doe
s
not ex
i
st i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
Jo
h
n
K
eeping
merge-tree: ha
n
dle directory/empty con
f
lict c
o
r
r
ect
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/M
a
k
efile: don't
de
f
ine TEST_R
E
SULTS_
D
IRECTORY recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
contrib/subtree: don't de
l
e
te r
e
m
o
t
e branches if s
p
lit
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
Jo
h
n Keeping
t
e
st output: respec
t
$TEST_OU
T
PU
T
_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Ma
k
efile: remov
e
smoke test target
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keep
i
ng
m
e
rge-tree
:
f
ix
typo in "both cha
n
g
e
d iden
t
ically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
Joh
n
Keeping
t/Makefile: fi
x
resu
l
t
h
and
l
ing w
i
th TES
T
_OUTPUT
_
DIRECT
O
RY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
trans
p
ort-hel
p
er: a
d
d 'signed-tags' ca
p
abi
l
ity
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepin
g
transpo
r
t-helper: pass --signed-tags
=
warn-stri
p
t
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Ke
e
p
i
ng
fast-export: add --signed-tags=
w
arn-st
r
ip mod
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepi
n
g
t/test-lib
.
sh: fix TRASH
_
DIRECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
Joh
n
K
eeping
merge-
t
ree: don't print e
n
tries that
m
atch "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitremote-helpers(1): clari
f
y refspec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
subm
o
d
u
le: print graph output nex
t
to submodule
log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eeping
dif
f
: allow un
s
tuck argument
s
with --diff-algorit
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keep
i
ng
g
i
t-
m
e
rge(1): do
c
ument diff-algorithm optio
n
to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisect:
a
v
oid signed i
n
tege
r
overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Ke
e
ping
d
iffcore-break: don't
d
ivide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keep
i
n
g
t7800: ru
n
--dir-
d
iff tests wit
h
a
nd without symlin
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eeping
t
7
800
:
fix
tes
t
s
when
diff
t
ool uses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n
Kee
p
ing
t7800:
d
o
n't hide grep ou
t
p
u
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
difftool: don't overwri
t
e
modified fi
l
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
t7800: move '--symlinks' specific
t
est to the e
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keepi
n
g
me
r
ge-tree: fix
t
y
po in merg
e
-
tree
.
c
:
:
u
nresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
J
ohn Keeping
refs
.
c: fix fread error
h
an
d
ling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn
Keeping
entry
:
fix
f
ilter
lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Kee
p
ing
t2003:
m
o
dernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
difftool --dir-dif
f
: symlin
k
a
l
l files matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepin
g
diffto
o
l:
avo
i
d doubl
e
s
l
ashes in symlink ta
r
get
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
e
p
ing
git-d
i
fftoo
l
(1): fix f
o
rmatting
o
f -
-
symlin
k
description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Rever
t
"graph
.
c: mark private fil
e
-scope symbo
l
s as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Makefi
l
e: make mandir, htmld
i
r
and in
f
odir absolut
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebase -i: re
s
pe
c
t cor
e
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
c
o
mbine-diff
.
c
: teach combined diffs a
b
o
u
t li
n
e p
r
efi
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
iff
.
c: us
e
d
iff_l
i
ne_
p
refix()
w
here applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
diff: a
d
d d
i
ff_line
_
pre
f
ix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
diff
.
c:
m
a
k
e c
o
n
stant str
i
n
g
argument
s
co
n
st
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: w
r
ite pr
e
fix to
t
h
e c
o
rrect file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
grap
h
: output paddin
g
for me
r
ge subsequ
e
nt parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t4038: add tes
t
s for "diff
-
-cc
-
-
r
aw <tr
e
es>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Ke
e
ping
builtin/apply
:
tighten (di
s
)
similarity
index par
s
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
m
erget
o
ol--lib: list user configu
r
e
d
tools in '--
t
o
ol
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keepin
g
Rename {git- =
>
git}remot
e
-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
o
h
n
K
eep
i
ng
CodingGuide
l
ines:
add Pyt
h
on co
d
ing gui
d
elin
e
s
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
g
it-remote-test
p
y: fix path hashing
on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John K
e
eping
mergetool
-
-lib: don't call "exit" in s
e
tup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next