repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'mg/show-notes-doc'
2015-03-31
Joh
n
Keeping
stre
a
ming
.
c: fix a memleak
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Keeping
completion: com
p
let
e
`g
i
t push -
-
force-w
i
t
h-lease=`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
J
o
hn K
e
eping
c
o
mpletion
:
add
some missing option
s
t
o
`git
push`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Ke
e
p
ing
completio
n
: compl
e
te "unstuck" `
g
it pus
h
--rec
u
rse
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
John Keeping
rebase
:
omit patch-identica
l
commits wi
t
h --
f
ork-p
o
int
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
John Keeping
reba
s
e--am:
u
se --c
h
erry-pick in
s
tead of
-
-
ignore-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keepi
n
g
compl
e
tion: add m
i
ssi
n
g options fo
r
gi
t
-merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keep
i
ng
co
m
ple
t
ion: add a note that merge opti
o
ns are shar
e
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John Keeping
builtin/mv:
fi
x
out of bounds
w
rite
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John K
e
epi
n
g
b
u
iltin/mv: don
'
t
use
memory
a
fter free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf8:
u
se correc
t
type for
v
alues in interval table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf8: fi
x
iconv erro
r
detection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keepin
g
n
o
t
es-utils: handle boole
a
n notes
.
rewrit
e
mod
e
correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
Jo
h
n
K
eeping
Makefile: remove redundant object in git-ht
t
p{fet
c
h
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
Joh
n
Kee
p
ing
pull: suppress error when no remot
e
ref is
f
ound
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keep
i
ng
completion: handle --[n
o
-]for
k
-
po
i
nt options
t
o
g
it
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
ohn Keeping
c
o
mp
l
etion
:
com
p
lete mer
g
e-ba
s
e options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
Joh
n
Keeping
rebase: fix fork-point with zer
o
ar
g
u
m
ent
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keep
i
n
g
re
b
ase: use reflog to find
c
om
m
on base with upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keeping
p
ull:
u
s
e
mer
g
e-base --fork-point w
h
e
n
appropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
p
e
ek-remote: remo
v
e
deprecated alias of ls-r
e
mote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Jo
h
n Keeping
lost
-
found: remov
e
depreca
t
e
d
c
ommand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
Keeping
t
a
r-tree: remove
d
eprecated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
repo-config:
r
emove dep
r
ecated alias fo
r
"
git co
n
fig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
J
ohn Kee
p
i
ng
D
o
cumenta
t
ion/Makefile: make
AsciiDoc dbla
t
ex di
r
conf
i
gurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
J
o
hn Keep
i
ng
m
e
rge-recursi
v
e: fix p
a
rsing of "diff-algorithm"
o
ption
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Jo
h
n
Keeping
rese
t
:
handle submodule with trailing slas
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Ke
e
p
i
ng
r
m:
re-use pa
r
se_pathspec's trailing-slash removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
J
o
hn Keeping
git_re
m
ote_helpers: rem
o
ve little used Python li
b
rary
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John K
e
eping
rev-parse(1)
:
logi
c
all
y
group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
Jo
h
n Keeping
rev-pa
r
se:
r
e
m
ove rest
r
iction
s
on some op
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John K
e
e
p
i
n
g
pull: change t
h
e description
to "in
t
egrate" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
K
eeping
p
u
sh: avoid suggest
i
ng "me
r
ging" remot
e
changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Joh
n
Keeping
git-conf
i
g(1): c
l
arify precedence of multiple valu
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
git-conf
i
g
:
update
d
o
c
for -
-
get
with multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Kee
p
in
g
c
o
mple
t
ion: l
e
arn about --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
o
hn Keeping
c
o
mpletion: h
a
nd
l
e uns
t
u
ck form of base git
o
pt
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Ke
e
ping
fa
s
t-i
m
po
r
t: allow
moving the root tr
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Keeping
f
ast-import:
allow ls or fil
e
cop
y
o
f the root tre
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
eepi
n
g
f
a
st-import
:
s
et valid mode
o
n r
o
ot
t
ree
in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
h
n Keeping
t9300:
d
ocument fa
s
t
-imp
o
rt empty path
i
ssues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
submod
u
l
e: drop
t
h
e
top-le
v
el requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keeping
r
ev-parse: add --
p
r
efix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
n
g
s
ubmo
d
ul
e
:
s
how full path i
n
e
r
ror
m
e
ss
a
ge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
t7403: add missing &&
c
h
a
ining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
t74
0
3: m
o
d
ernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
t7401: m
a
k
e ind
e
ntation con
s
istent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keeping
mergetool--l
i
b:
r
efac
t
or {dif
f
,mer
g
e}_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn
K
e
epi
n
g
D
o
cumentation/
M
akefile:
m
ove infodir to be
w
ith other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keeping
Documentat
i
on/Makefile: fix spaces ar
o
u
nd ass
i
gnments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
add--i
n
teract
i
ve: respect diff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
Joh
n
K
e
eping
git-gui: fix file nam
e
handl
i
ng with non-
e
mpty pref
i
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
Joh
n
Keeping
fetch: don't try to update unfetc
h
ed tra
c
king refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John
K
eeping
difftool:
f
i
x dir-diff w
h
en file does not
exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-tree: h
a
ndle di
r
ecto
r
y/empty c
o
nflict c
o
rrect
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John
Ke
e
ping
t
/M
a
kefil
e
: don't define TEST_RESULTS_DIRECTORY recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John
K
eeping
c
o
ntrib/subtree:
d
on't delete remote
b
ranches
i
f split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test
o
ut
p
ut: respect $TEST_OUTPUT_D
I
RECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
ohn Keeping
t
/
Makefile: remo
v
e
s
moke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Joh
n
Keeping
merge-tr
e
e
:
fix typo in
"
b
ot
h
changed
i
de
n
tically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
Joh
n
K
ee
p
ing
t
/Makefile: f
i
x re
s
ul
t
handling with
T
E
S
T
_OU
T
PUT_D
I
RECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
h
n
K
e
e
ping
trans
p
o
r
t-
h
elper:
a
dd
'si
g
n
e
d-ta
g
s' capab
i
l
i
ty
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepi
n
g
trans
p
ort-helper: pass
--signed-ta
g
s=warn
-
strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepin
g
fast-export:
add --signed-tags
=
warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Kee
p
ing
t/test-lib
.
sh: fix TRASH_
D
I
R
ECTORY h
a
ndling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
Jo
h
n
K
eepi
n
g
merge-tr
e
e
:
don't print
e
ntries t
h
at m
a
tch
"
local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitremote-helpers(1
)
: clarify re
f
spec
b
ehaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n K
e
e
p
ing
subm
o
du
l
e: print graph output
n
ext to s
u
bmodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
diff: allow unstuck ar
g
ume
n
ts with --
d
iff-a
l
go
r
ithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
oh
n
Keeping
git-merge(1): document diff-algorithm option
t
o merg
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisect: avoid
s
igned integer ov
e
rflo
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Keeping
d
i
ffc
o
re
-
break: don't div
i
de
b
y zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t780
0
: ru
n
--dir-dif
f
te
s
t
s
w
i
th
a
nd witho
u
t symlink
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keeping
t7
8
00: fi
x
tests wh
e
n
difftool
u
ses -
-
no-symlin
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
t7
8
00: don't hide grep out
p
ut
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keeping
difftool:
don't overwr
i
te mo
d
ified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Ke
e
p
i
ng
t7800:
m
ove '--symlinks' spec
i
fic test
to
t
he
end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
Jo
h
n Ke
e
ping
merg
e
-tree: fix
typo in merge-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Kee
p
ing
re
f
s
.
c:
f
ix fr
e
ad error handlin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entry: fi
x
fil
t
er lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Keeping
t20
0
3: moderniz
e
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
diff
t
ool -
-
d
i
r-diff: s
y
m
link
a
l
l files matching
t
he
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepi
n
g
difftool: avo
i
d double slashes in symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
g
it-diffto
o
l
(
1): fix formatting of --sy
m
l
i
n
k d
e
sc
r
ipti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Revert "graph
.
c: mark private f
i
le-scop
e
symbo
l
s a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
Jo
h
n K
e
e
p
ing
Makefile
:
make
mandir, ht
m
ldir and infodir abso
l
ute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
r
e
base -i: resp
e
ct core
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
co
m
bine-diff
.
c: teach combined diffs about line
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
diff
.
c:
u
se
diff_line_prefix() where applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
d
i
ff: add diff_l
i
ne_prefix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
diff
.
c
:
make con
s
t
a
nt string argu
m
ents const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
diff: wri
t
e
p
refix to the cor
r
ect fil
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John
Keeping
grap
h
: output padding for merge subsequen
t
parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John K
e
eping
t4038: add tests for "diff --cc
--raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n
K
eepin
g
builti
n
/apply: tighte
n
(
dis)s
i
milarity index p
a
rsi
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Joh
n
Keeping
m
e
rgetool--lib:
l
is
t
user configur
e
d
tools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keep
i
n
g
Rename {g
i
t
-
=>
git}remote-
h
elpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
Joh
n
Keeping
CodingG
u
id
e
li
n
e
s
: add
Pyth
o
n
c
odi
n
g guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
g
i
t
-r
e
mote-testpy: fix path hashing
on Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Ke
e
pi
n
g
mer
g
etool--lib
:
d
o
n't call "exit"
i
n set
u
p_t
o
ol
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next