repo.or.cz
/
git
/
mingw
/
4msysgit.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
John Keeping
com
p
letion: add a note that merge options
a
re shar
e
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
J
o
h
n Keeping
b
u
i
ltin/mv: fix
o
u
t
of boun
d
s
write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
builti
n
/m
v
: don't
use m
e
mor
y
after free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
ohn K
e
eping
utf
8
: use correct type
f
o
r
v
alues in interval table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Jo
h
n Keeping
utf8: fix icon
v
er
r
or de
t
ection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
notes-utils:
handle boolean notes
.
rewritemode cor
r
ectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John Keeping
Makefi
l
e: r
e
m
ove re
d
undant object in git
-
h
t
tp{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John Ke
e
ping
p
ull:
s
uppr
e
ss error
w
hen no re
m
oteref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
ohn Kee
p
i
n
g
c
omplet
i
on: h
a
ndle --[no-]f
o
r
k
-point
opt
i
ons to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
ohn
Keep
i
n
g
completion:
complete m
e
r
ge-base opti
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keeping
re
b
ase: fix f
o
r
k-
p
oint
w
ith zero arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
J
o
hn Ke
e
ping
reba
s
e:
u
s
e
reflog to find common b
a
se with upst
r
e
a
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John
K
e
e
ping
pull: use merge-base --
f
ork-point wh
e
n app
r
o
p
riate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn
K
e
e
ping
peek-remote:
remov
e
deprecate
d
ali
a
s of l
s
-r
e
mote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
Keeping
lost-found
:
remove
d
eprec
a
t
e
d command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
K
eepi
n
g
tar-tree: remove deprecated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
Keepi
n
g
re
p
o
-co
n
fig:
r
e
m
ove deprec
a
ted alias for "git con
f
ig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
Documentation/M
a
ke
f
ile
:
m
ake AsciiDoc db
l
atex di
r
conf
i
gurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
merge-recursive:
fix
parsing of "d
i
ff
-
algorithm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Jo
h
n Kee
p
ing
r
e
set: handle
su
b
module
w
i
th
t
railing sla
s
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John
K
e
eping
rm: re
-
use parse_
p
athspe
c
'
s traili
n
g
-
slash removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
n Keeping
git_remote_h
e
lpe
r
s
:
remove little used Python li
b
rary
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
ohn Kee
p
ing
rev-parse(1): logically group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John
K
eeping
rev-pa
r
se: remov
e
re
s
trictions on s
o
me options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pull
:
chan
g
e the descr
i
ption
t
o "in
t
egrate" chan
g
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Jo
h
n Keep
i
n
g
push: avoid s
u
ggesting "mer
g
ing"
r
emote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
gi
t
-co
n
fi
g
(1): clari
f
y
preced
e
n
c
e of multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
Jo
h
n Keeping
git-config: update doc f
o
r --get wit
h
mu
l
tiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
o
h
n Keeping
completion: l
e
arn abou
t
--man-pa
t
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
completion
:
handle u
n
s
t
uck form of
base git options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John K
e
eping
fast-
i
mp
o
rt: allo
w
moving the
r
oot tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n Keepi
n
g
fas
t
-import
:
a
l
l
ow l
s
or filecopy of the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-imp
o
rt:
s
et valid mode on roo
t
tree in "ls
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t93
0
0: document fas
t
-
i
mpor
t
empty
pa
t
h issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule: drop the top-level requir
e
m
ent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
rev-
p
arse: a
d
d --prefix optio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
submodule: sh
o
w full
p
ath in error mes
s
age
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403: ad
d
missing && chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
t7403: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7401: make indentation consi
s
tent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
m
e
r
g
etoo
l
--lib: re
f
act
o
r {diff
,
merge}_cmd lo
g
ic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keeping
Documentation/Makefile: move
i
nfodir to be
w
ith other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keep
i
ng
Document
a
ti
o
n/Makefile: fix sp
a
ces a
r
o
und a
s
signments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John
K
eeping
add
-
-inte
r
active
:
re
s
pec
t
diff
.
algori
t
hm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
J
ohn
K
ee
p
ing
gi
t
-gui: fix fil
e
name
h
andling with non-empty pref
i
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
Jo
h
n
Keeping
fet
c
h
:
d
on
'
t
try t
o
u
pdate unfetched tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
Jo
h
n
K
e
eping
diff
t
o
ol: fix dir-diff when 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
d
irectory/emp
t
y conflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t
/
Mak
e
f
i
le: don'
t
define TES
T
_RESU
L
T
S_DIRECTOR
Y
r
e
cursi
v
el
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John K
e
eping
contrib/subtree: don't delete remote b
r
a
nches if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
Joh
n
K
eeping
tes
t
ou
t
put: respect $TEST_OUTPUT_DIRECTOR
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefile: remove smoke
test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keepi
n
g
merg
e
-tree: fix typo in
"bot
h
changed
identi
c
ally"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
J
o
hn Keepi
n
g
t/Ma
k
efile: fi
x
resul
t
handling with TEST_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transport-helper: add '
s
igned-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eep
i
ng
transpo
r
t
-helper: pass -
-
signed-tags=warn-strip
t
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n Keepin
g
f
a
st-export:
add --s
i
gned-tags=warn-str
i
p m
o
de
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn
K
e
eping
t
/
te
s
t-lib
.
sh: fix TRASH
_
DI
R
ECTO
R
Y handlin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John
Keeping
m
e
rge
-
tree:
d
on't print entries that match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
Joh
n
K
eeping
gitremot
e
-helpers(1): clari
f
y refspec behavio
u
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John K
e
epi
n
g
submodule: print
gr
a
ph output next t
o
s
ubmodule
log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
diff: allow
unstuck arguments with --d
i
ff-alg
o
rithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Kee
p
ing
git-merge(1): document diff-algorithm option to
m
erge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John K
e
e
ping
bis
e
ct:
avoid signed in
t
eger overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn Keeping
diffcore-break:
d
on't divide
by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keep
i
n
g
t7800: run --dir-diff tests wi
t
h
a
n
d withou
t
symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
e
eping
t7800:
fix
tests when difft
o
ol uses --no-sym
l
inks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keeping
t7800: don't hide grep
output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
d
ifftool:
d
o
n't
ov
e
rwrite modif
i
e
d
files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
p
i
ng
t7800:
m
ove '--
s
ymli
n
k
s
'
specif
i
c
te
s
t
to
t
he en
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John
Keeping
mer
g
e-tr
e
e
:
fix typ
o
in merge-tre
e
.
c
::u
n
resolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
Joh
n
Keepi
n
g
refs
.
c: fix fread err
o
r handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn K
e
e
p
ing
e
ntry: fix f
i
lter look
u
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepin
g
t
2
003: mod
e
rnize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Kee
p
i
n
g
difftoo
l
-
-
d
ir-dif
f
:
s
yml
i
nk al
l
files m
a
t
ching t
h
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
d
ifftool: avoid dou
b
l
e slashes in
symli
n
k ta
r
gets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-difftool(1): fix
for
m
atting of --symlink description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Kee
p
ing
Revert "graph
.
c: ma
r
k
private file-scope s
y
mbols
a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
ohn Keeping
Makefile:
make mandir, htmldir
and infodir absol
u
te
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
rebase -i: respec
t
core
.
com
m
entch
a
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
combine-diff
.
c: teac
h
com
b
ine
d
diffs ab
o
ut line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
diff
.
c:
u
se d
i
ff_line_prefix
(
) where app
l
icable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keep
i
ng
diff: add diff_line_prefix
function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
e
eping
d
iff
.
c: make co
n
stant string argument
s
con
s
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n
K
ee
p
ing
dif
f
: write p
r
e
f
ix to the
c
orre
c
t fil
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keepi
n
g
graph: output padding
for me
r
ge subsequent p
a
r
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t4038
:
add tests
for "diff --cc --raw <t
r
ees
>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
built
i
n/apply: tig
h
ten (dis)si
m
ilarity
in
d
e
x
parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
mergetool--l
i
b: list user confi
g
ure
d
tools in '--to
o
l
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Rena
m
e
{git
-
=> git
}
r
e
mote-h
e
lpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Ke
e
pin
g
Co
d
ingGuid
e
lines:
a
d
d
P
yt
h
on co
d
ing guideli
n
es
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-remo
t
e-testpy:
f
i
x
p
ath ha
s
hing on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
Jo
h
n
Kee
p
ing
m
e
r
getool--lib: don
'
t cal
l
"e
x
i
t
" in se
t
up_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
K
e
epi
n
g
git-difftool: us
e
g
i
t-merge
t
ool--lib for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergetool: don
'
t
ha
r
dcode
'
m
erget
o
ol' in show_tool_h
e
lp
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t-mergetool: remov
e
redundant ass
i
gnme
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-me
r
getoo
l
:
mov
e
show_
t
oo
l
_
help to mergetool--
l
ib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote-test
p
y: call print as a fun
c
tio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git-r
e
mo
t
e-testpy: don't do unbuffered t
e
xt I
/
O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git-remote-testpy: hash
b
ytes explici
t
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next