repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
mv: flatten error handling code block
2014-07-22
John Keeping
co
m
pletion: co
m
plete `git push --force-wi
t
h-lea
s
e
=
`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Ke
e
ping
completion
:
ad
d
some missing options to `git p
u
sh`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Keeping
comp
l
etion: c
o
mplete
"unstuck" `git push --r
e
c
u
r
s
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
John
K
eep
i
ng
rebase:
omit patch-
i
dentical c
o
mmits with --fork-point
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
J
ohn Keepin
g
re
b
a
se--am
:
u
se --
c
herry-pi
c
k
i
ns
t
ead of --igno
r
e-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
comple
t
ion:
a
dd missing optio
n
s
f
or g
i
t-mer
g
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
complet
i
on
:
add a note
that merge options
a
r
e s
h
ared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
Joh
n
Keeping
builtin/mv: fix out of bou
n
ds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
oh
n
K
e
e
ping
bu
i
l
tin/mv: d
o
n't use
m
e
mory after
f
r
ee
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
o
hn Keeping
utf8: use correct t
y
p
e
for val
u
es in inte
r
val ta
b
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John K
e
ep
i
ng
utf8
:
fix iconv error detection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Kee
p
ing
notes-utils: ha
n
dle b
o
olean notes
.
r
ewritem
o
de correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John Keepin
g
Makefile:
re
m
o
v
e
red
u
ndant
o
bject in git-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John Keeping
p
ull: suppress error when
no r
e
mote
r
ef is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
Jo
h
n Keeping
completion: handle --[no-]fo
r
k-po
i
nt
o
p
t
i
o
ns to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
ohn
K
eepin
g
completion: complete merge-base op
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keepin
g
r
e
b
ase:
f
i
x
fork-p
o
i
n
t with zero arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
J
o
hn Ke
e
pi
n
g
rebase: use re
f
l
o
g to find common base
wit
h
up
s
t
r
e
a
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Kee
p
ing
p
ull: use merge-
b
a
s
e --fork-
p
o
in
t
when appropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Joh
n
K
eeping
p
e
e
k-
r
em
o
te: r
e
move
d
epr
e
cated
alias
o
f
l
s-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
Keeping
l
ost-found: remove dep
r
e
cated
c
o
m
mand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn Keep
i
ng
tar-tree: remove depreca
t
e
d
comma
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keepin
g
r
e
p
o-co
n
fi
g
: remove deprecated alias for
"git co
n
fig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John
Keeping
Docu
m
ent
a
tion/M
a
kef
i
le: make As
c
iiDoc
d
b
la
t
ex dir configurabl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
J
o
hn Keeping
merge-recursive
:
fix parsing of "di
f
f-
a
lgorithm" opti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
ohn Kee
p
ing
reset: han
d
l
e
su
b
modu
l
e with trailing
s
las
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm: re-u
s
e
pars
e
_pa
t
hs
p
ec's
trailing-slas
h
removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
J
o
hn Keepin
g
g
it_
r
emote_h
e
lpers: remove l
i
ttle
u
s
e
d Python
lib
r
a
r
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-
p
ars
e
(1)
:
logic
a
lly group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keepi
n
g
rev-parse: re
m
o
ve
r
e
s
t
rictio
n
s on some options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keepi
n
g
pull: change the descri
p
tion to "integ
r
ate"
c
hanges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
pus
h
: avoid s
u
gg
e
st
i
ng "merging" rem
o
te change
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
K
e
e
ping
git-conf
i
g(1
)
: cl
a
rify
p
r
e
ced
e
nce o
f
multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
Joh
n
Keeping
gi
t
-
c
onfig
:
updat
e
doc
f
or -
-
get w
i
th
m
ultiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
comp
l
etio
n
: learn a
b
o
u
t --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
c
o
mpletion: handle unstuck for
m
of
b
ase git
option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keepin
g
fas
t
-im
p
ort: a
l
low
m
oving the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-
i
mport: all
o
w ls or file
c
opy of the
root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
e
e
ping
fast-import: set
v
ali
d
mo
d
e o
n
root tree in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n
Kee
p
ing
t93
0
0: do
c
u
ment fa
s
t-import empty pa
t
h issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Ke
e
ping
su
b
mod
u
l
e: d
r
op the top-level r
e
quire
m
ent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
rev-p
a
rse: add --prefi
x
o
p
tio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submod
u
l
e: show full path in err
o
r message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n
K
eeping
t7403:
add missing
&& chaini
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
ng
t
7
403: moderniz
e
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t
7401:
make
in
d
enta
t
ion consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
K
eeping
mergetool--l
i
b: refactor {diff,me
r
ge}
_
cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
D
o
c
u
mentation/Makefi
l
e: move in
f
odir to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
e
p
ing
Documentation/M
a
kefile
:
fix s
p
aces around a
s
s
i
gnments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
J
ohn Ke
e
ping
add--inter
a
ctive: re
s
pect di
f
f
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Kee
p
ing
git-gui: fix file name
ha
n
dling with non-empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keepin
g
fetch: don't try to updat
e
unfetched
t
rack
i
ng
refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
diffto
o
l: fi
x
dir-diff when file d
o
es not
e
xis
t
i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keepi
n
g
merge-tree
:
handle directo
r
y/emp
t
y conflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John
Keeping
t/M
a
kefile:
d
on't defi
n
e TEST
_
RESULTS
_
D
I
RE
C
TORY recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John K
e
ep
i
ng
con
t
rib/subtree: don't delete re
m
ote branches
if spli
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
Joh
n
Keeping
test ou
t
put
:
respe
c
t
$TEST_OUTP
U
T_DIREC
T
O
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Jo
h
n
Keepin
g
t/Ma
k
efi
l
e: re
m
ove smoke test t
a
rgets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn Keeping
merge-tree: f
i
x t
y
po in "bo
t
h changed iden
t
ically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t
/M
a
k
efile: fix resul
t
handling
with
T
EST_OUTPUT_DIRECT
O
RY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
tr
a
ns
p
ort-helper: ad
d
's
i
gne
d
-tags
'
ca
p
a
bility
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
tra
n
sport-helper: pass
--sign
e
d-tags=warn
-
st
r
i
p t
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
ng
fast-export
:
add
-
-s
i
gn
e
d-tags=warn-strip
m
ode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepin
g
t
/test-lib
.
sh
:
fi
x
TRA
S
H_DIR
E
CTOR
Y
handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John
Keepin
g
m
erge-tree:
d
on't p
r
in
t
entries th
a
t
ma
t
c
h "
l
ocal"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keep
i
ng
gitremote-helper
s
(1)
:
c
larify refspec behavio
u
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn Keepi
n
g
submodule: print graph output next to subm
o
dule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
diff
:
allow uns
t
uck arguments with --d
i
ff-al
g
orithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
git-merge(1): document
diff-algor
i
th
m
o
p
t
ion to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
K
eepi
n
g
b
isect: avoid signed integer
overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John K
e
e
p
i
n
g
diffcore-break: don't divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800
:
run -
-
dir-diff tes
t
s with and
without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: fix tests when difftool uses --
n
o
-
symli
n
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n
K
eeping
t7800: don't hide
grep
o
utput
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keeping
difftoo
l
: don't ove
r
wr
i
te mo
d
ified
f
i
les
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keepi
n
g
t78
0
0
:
move
'
--symlinks' specific test to the en
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
Jo
h
n Keeping
merge-tree: fix typo in merge-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keep
i
n
g
refs
.
c:
f
ix f
r
ead
e
rror handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entry: fix filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eepin
g
t2
0
0
3: modernize s
t
yle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
difftool --dir-d
i
ff: symlink all fi
l
es m
a
tching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
h
n Keeping
difftool: avo
i
d
double slashes in symlink t
a
rgets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
h
n
Keeping
git-difft
o
ol
(
1): fix formatting of --symlin
k
description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
J
ohn Keep
i
n
g
Revert "graph
.
c: mark priv
a
te
f
i
l
e
-scope symbo
l
s as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
o
hn Keeping
Ma
k
efile: make
mandir, htmldir and infodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
r
ebase -i: respe
c
t
core
.
co
m
mentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
co
m
bine-dif
f
.
c: teac
h
combined diffs
about
l
ine
p
refix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
d
i
ff
.
c: u
s
e diff_line
_
prefi
x
() where
a
pplicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eeping
d
i
f
f: add diff_line_prefix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eeping
diff
.
c: make c
o
n
stant string arguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
diff: write prefix to the correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
o
hn Ke
e
p
ing
graph: output pa
d
ding for merge su
b
sequent
p
arents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keepin
g
t4038: add
t
ests for "di
f
f --cc --raw
<
t
rees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keepin
g
builtin/
a
pp
l
y: tig
h
ten
(dis)similarity index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n Keeping
mergetool-
-
lib: list
user c
o
nfigured tools
i
n '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
Jo
h
n Keeping
Renam
e
{git- =>
git}re
m
ote
-
help
e
rs
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keep
i
ng
CodingGuidelines: add
Py
t
h
on coding gu
i
delines
commit
|
commitdiff
|
tree
2013-01-28
J
ohn Keeping
git-remote-testpy: f
i
x pa
t
h hashing on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John K
e
eping
merg
e
tool
-
-lib: do
n
'
t
c
all "
e
x
it" in
setup_to
o
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Kee
p
ing
git-di
f
ftoo
l
: u
s
e git-mergetool--li
b
for "--tool-help
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next