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
code and test: fix misuses of "nor"
2014-01-27
John Keeping
Makef
i
le: remove redundant
obj
e
ct in git-h
t
tp{fe
t
ch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John Keeping
pu
l
l: suppress error when no rem
o
t
e
ref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
comp
l
etion
:
handle -
-
[no-]fork-point op
t
ions
t
o git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
comple
t
ion: complete
me
r
ge-bas
e
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
J
ohn Keeping
r
e
base
:
f
ix fork
-
point
with zero arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
J
o
h
n
K
eeping
r
e
base: use re
f
lo
g
to fi
n
d common base
w
i
th upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John
K
eeping
pul
l
: use me
r
ge-bas
e
--fork-point when a
p
propriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn Keeping
peek-remote: re
m
ove de
p
r
eca
t
ed
alias
o
f ls
-
remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
lost-f
o
und: rem
o
ve
d
e
precated com
m
and
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Jo
h
n Kee
p
ing
t
ar-tree
:
remove deprecated com
m
and
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn Keeping
repo-config: remove deprecated alias
f
or "git c
o
nfig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
D
ocumentation/Makefil
e
: make AsciiDoc
d
bla
t
ex
d
ir
c
onfigurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
J
ohn K
e
e
ping
merge-recur
s
i
ve: fix
pars
i
ng of "diff-algo
r
i
thm"
option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
o
h
n Keepi
n
g
res
e
t:
handle subm
o
du
l
e wi
t
h trailing slas
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keep
i
n
g
rm: re-use parse_pathspec's tra
i
l
ing-slash re
m
oval
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
J
o
h
n
Keepin
g
g
i
t_remot
e
_helpers: r
e
move little used Python li
b
rary
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
Joh
n
Keeping
rev-par
s
e(1)
:
logical
l
y group opti
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
o
hn Ke
e
ping
r
e
v-parse:
remove res
t
rictions on
s
ome op
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
J
ohn Keepin
g
pull: c
h
ange the description to "integ
r
ate" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keepin
g
push:
a
void suggesting "merging" remot
e
changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
git-con
f
i
g(1):
c
l
a
rify preceden
c
e of multipl
e
values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
git-config: update do
c
for -
-
get with mult
i
p
le values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
ohn Keepin
g
completi
o
n: lear
n
about --man-pat
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John K
e
eping
com
p
l
et
i
on
:
hand
l
e un
s
tuck
f
orm o
f
ba
s
e git options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Keep
i
ng
fast-import:
allow m
o
v
i
ng
t
he
r
oot tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn Keeping
fast-i
m
port: allow
l
s
or f
i
leco
p
y of
t
h
e
root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-im
p
ort: set
va
l
id m
o
d
e
o
n root tree in "ls
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
Ke
e
p
i
n
g
t93
0
0: d
o
cument
fast-imp
o
rt empty path iss
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
s
u
bm
o
dule:
dro
p
the t
o
p-
l
evel
r
e
quirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
rev-parse: add
-
-prefix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodul
e
: show full path in
e
rror
mes
s
ag
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403:
a
dd mi
s
sing &
&
c
h
aining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepin
g
t7403: moder
n
ize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keep
i
ng
t7401
:
make in
d
entation consist
e
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
mergetool--lib:
r
efacto
r
{di
f
f,
m
e
r
g
e}_cmd l
o
g
i
c
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Kee
p
ing
D
o
cum
e
n
t
ation/Makef
i
le:
m
ove info
d
ir to b
e
wi
t
h
o
ther
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Ke
e
ping
D
o
cumentation/M
a
kefi
l
e
:
fix spaces
a
round assi
g
nments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
Joh
n
Keepin
g
add
-
-interactive: respect diff
.
algor
i
thm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keepin
g
git-gui: fix file name handl
i
ng
w
ith non-empty pref
i
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Ke
e
pin
g
fetch: don't try to up
d
a
t
e
u
n
fetched trac
k
ing ref
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
dif
f
tool: f
i
x dir-dif
f
when fil
e
does not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
Joh
n
Keeping
merge-tr
e
e: han
d
l
e
directory/
e
mpty conflict cor
r
ect
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
J
ohn Ke
e
ping
t
/
M
akefile: don't defin
e
TEST_RESULTS_DIRECTORY recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keepin
g
contr
i
b/su
b
tree: don't de
l
ete remot
e
bran
c
hes
if
s
plit
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Ke
e
p
ing
t
e
s
t
output:
r
espe
c
t $TEST
_
OUTPUT
_
DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefile: remove smoke t
e
st targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keepi
n
g
mer
g
e-
t
ree: fix typo in "both changed
i
dentically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keepi
n
g
t/Makefile: fix resu
l
t handling with TEST_
O
UTPUT_DIRE
C
TORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eep
i
ng
transpo
r
t-helper: add 'sign
e
d-t
a
gs' ca
p
ab
i
lity
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
r
ans
p
ort-helper: p
a
ss --si
g
ned-t
a
gs=
w
arn-s
t
r
i
p to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n Keeping
fast-export
:
add --signed-tag
s
=warn-stri
p
m
ode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
ing
t/te
s
t-li
b
.
sh
:
fix TRAS
H
_DIRECTORY
h
a
ndling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Ke
e
p
i
n
g
m
e
r
g
e-t
r
e
e:
d
on't print entries
that match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
J
ohn Keepin
g
gitremote-he
l
p
e
rs(1): clarify refspec b
e
haviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn Keeping
s
u
bmodule
:
print gr
a
p
h
o
u
t
p
ut next to sub
m
odule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Kee
p
ing
d
iff: allow unstuck ar
g
ume
n
ts with
-
-diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
h
n Keeping
git-merge
(
1):
document
di
f
f-
a
lgorithm option to
m
er
g
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
oh
n
Keepin
g
bisect: avoid sign
e
d
integer overf
l
ow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn Keepin
g
diff
c
ore-br
e
ak:
don'
t
divide
b
y zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keeping
t
7800: run -
-
d
ir-diff tes
t
s with
a
n
d
wi
t
hout
symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Ke
e
ping
t7800: fix tests when d
i
f
f
t
ool
u
se
s
--no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
h
n
K
e
eping
t7800: d
o
n'
t
h
ide grep out
p
ut
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keeping
d
i
ff
t
ool
:
don't overw
r
ite
m
odifie
d
fi
l
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Kee
p
ing
t7800: move '--sym
l
inks'
specific
t
est to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
merge
-
tree: fi
x
typ
o
in merge
-
t
ree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John K
e
eping
refs
.
c: fix fread e
r
ror
h
a
n
dling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
e
n
t
r
y: fix filter
l
oo
k
up
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Ke
e
ping
t200
3
:
m
odernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
epi
n
g
d
i
fftool --di
r
-dif
f
:
s
ymlink
a
ll
fi
l
es
matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
e
p
ing
difftool: avoid double slashes in
symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keep
i
ng
git-difftool(1): fix
f
ormatting of --symlink description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
R
ev
e
rt "gr
a
ph
.
c: mark private file-scope s
y
mbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
ohn Keepi
n
g
Makefile: mak
e
mand
i
r, ht
m
ldir and infodir a
b
so
l
ute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
r
ebase
-
i: respe
c
t
c
ore
.
commen
t
c
h
a
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
com
b
ine-diff
.
c: teach combi
n
ed d
i
ffs a
b
out line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
diff
.
c:
use
d
iff_line_prefix() where applic
a
ble
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff:
a
dd diff_
l
ine_pre
f
i
x
function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
i
ff
.
c: make constant
s
tring arguments c
o
n
st
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eepi
n
g
diff
:
write
p
re
f
ix to the correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
Jo
h
n Keeping
graph
:
o
u
t
pu
t
pad
d
i
ng fo
r
m
e
rge
subseque
n
t pa
r
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
Joh
n
Kee
p
ing
t4038: add tests for "diff
--
c
c
--raw <
t
rees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
buil
t
in/apply: tight
e
n (dis)similarity index
p
a
rsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
ohn Keeping
mergetool--li
b
: list user configured
t
ools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Rename {git- =>
g
it
}
remote-he
l
pers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
CodingGuidelines: add Pyt
h
on coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
J
ohn Keeping
g
i
t-r
e
mote-t
e
stpy: fix path hashin
g
on Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Ke
e
p
ing
mergeto
o
l
-
-l
i
b: don't call
"exit" i
n
setup_t
o
o
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
i
n
g
git-difft
o
o
l
: use git-mergetool--lib for "--t
o
o
l-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
g
it-
m
ergetool: don't hardco
d
e '
m
ergetool' in show
_
t
o
ol_
h
elp
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git-mergetool: remov
e
redundant assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-
m
ergetool: mo
v
e show_tool_help to merget
o
ol--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git-remote-testp
y
: call pri
n
t as
a
function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git
-
remote-testpy:
d
on't do unbuffered text
I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote-test
p
y: hash by
t
es explicitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
svn-fe: a
l
l
o
w s
v
nrdu
m
p_sim
.
py to run w
i
th Py
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git_r
e
mote
_
hel
p
ers: use
2
to3 if b
u
ilding with P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
oh
n
Keepi
n
g
git_remote_h
e
lpers: forc
e
rebuild if python version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Ke
e
p
ing
g
it-cvsimport
.
t
xt: cvsps-2 is depre
c
ated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keep
i
ng
git-for-ea
c
h-ref
.
txt:
'
raw' is a s
u
ppor
t
ed
d
ate format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
ohn Keeping
g
i
t_
r
emo
t
e_helpers:
fix
i
n
pu
t
when runni
n
g under
Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next