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
Merge branch 'master' of git://repo.or.cz/alt-git
2015-09-25
John Keep
i
ng
Docume
n
tation:
f
ix sectio
n
header
mark-up
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-11
John Kee
p
ing
D
o
cumen
t
a
tion/git-rebase: fix --no-autos
t
ash formatting
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-11
Joh
n
K
e
eping
rebase:
s
up
p
ort --no-aut
o
s
tash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-10
John Keeping
Makef
i
le
:
f
ix MA
K
EFLA
G
S tests with multi
p
l
e flags
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
John Keeping
i
nterpret-trailers: al
l
ow running o
u
tside a repositor
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
John
Keepi
n
g
test-lib-func
t
ions: detect
test_whe
n
_
finished
i
n subshe
l
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
John Ke
e
ping
t7800: don't use test_config in
a
subshel
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
John K
e
e
p
in
g
test-
l
ib-functio
n
s: support "test_config -C <dir>
.
.
.
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
John Kee
p
ing
t5801: don't use test_whe
n
_finished
in a s
u
bshell
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
Joh
n
Keeping
t7610: don'
t
use test_config in a subs
h
ell
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John Keeping
t
6300: add tests
f
or "
-
local" date formats
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John
K
e
eping
t6300: make U
T
C
and local d
a
tes differ
e
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John Keeping
date: check for
"
local" before a
n
ything
else
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John Keeping
t6300: add test for
"
r
aw" date
format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John Keep
i
ng
t63
0
0: in
t
roduce test_date() helper
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John K
e
eping
Docu
m
entation/rev-list: don't l
i
st date for
m
a
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John Ke
e
ping
D
o
cu
m
ent
a
tion/git-for-each-ref: don't l
i
s
t
date formats
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
J
ohn Keeping
Do
c
u
m
entation/config
:
do
n
't lis
t
date forma
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John
Keeping
Documen
t
at
i
on/blam
e
-option
s
: do
n
't list date
f
ormat
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-03-31
John Keeping
streaming
.
c: fix
a mem
l
eak
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
J
oh
n
K
e
e
pin
g
completio
n
: complete `
g
it push --force-with-lease=`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
Joh
n
K
e
e
p
in
g
c
o
mp
l
eti
o
n: a
d
d
s
o
m
e missin
g
optio
n
s
to `g
i
t push`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
Jo
h
n Ke
e
ping
co
m
p
letion: c
o
mplete
"
unstuck" `git push --recurse
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
Jo
h
n
Ke
e
ping
rebase: om
i
t
p
atch-ident
i
cal
c
ommits wi
t
h -
-
f
ork-po
i
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
John
Keeping
rebase--
a
m: use --cherry-pick inst
e
ad of --
i
gnore-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
J
o
hn Keepi
n
g
co
m
p
let
i
on: add
missi
n
g
options for git-merg
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
c
o
mpleti
o
n: add a n
o
te t
h
at
m
erge optio
n
s are sha
r
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John Keeping
builtin/mv:
fix
o
ut of bound
s
write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John K
e
eping
builtin/mv: don
'
t use memory after
f
ree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keepi
n
g
utf
8
:
u
s
e
c
o
rrect t
y
pe for va
l
ues in inte
r
val table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keepin
g
utf8: fix
ic
o
nv error d
e
tection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
ohn Keeping
no
t
es-util
s
: handle b
o
o
lean notes
.
rewrit
e
m
ode
correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John
K
eepin
g
M
a
kefil
e
:
re
m
ove red
u
ndant object in git-http{fet
c
h
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John Keep
i
ng
p
u
l
l
:
s
u
ppress erro
r
w
h
e
n
no
r
emoteref is f
o
und
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Ke
e
ping
comp
l
etion:
h
a
nd
l
e -
-
[n
o
-]fork
-
poin
t
o
p
tions to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John K
e
e
ping
completion: comp
l
ete merge-ba
s
e opti
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John
K
e
e
p
i
ng
rebase
:
fix fo
r
k-poi
n
t with
z
e
ro
a
rguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
rebase: u
s
e
reflo
g
to find
c
o
m
mon base with upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keep
i
ng
pull: use me
r
ge-bas
e
--
f
ork-point
w
h
en appropriat
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keep
i
ng
peek-remote: remove
deprecated alias of ls-remo
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn Keeping
l
o
s
t
-found:
rem
o
ve
d
eprecated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
h
n
Kee
p
i
ng
t
a
r-tree: remove de
p
recated
c
ommand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keep
i
ng
rep
o
-config: remove depreca
t
ed alias for "gi
t
c
onfig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
J
ohn Keeping
Documentation
/
Makef
i
l
e:
m
ake AsciiDoc
d
blate
x
dir configurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keepi
n
g
merge-
r
e
c
u
r
s
ive: fix parsing of "diff-algori
t
hm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keepin
g
reset
:
h
a
ndle submodule with trailing s
l
ash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John
Kee
p
i
n
g
rm: re-us
e
parse_pa
t
hspec's trailing
-
s
lash removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
n Keeping
git_remote_
h
e
l
pers: remove
lit
t
le
used Python libr
a
ry
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-pa
r
se(1)
:
lo
g
i
c
a
l
ly group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-parse: remove res
t
r
ictions
on some options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
J
oh
n
Keep
i
ng
pull: change
the description to "integrate" cha
n
ges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Joh
n
Keeping
push:
a
v
o
id s
u
ggesti
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
)
: c
l
arify p
r
ecedence of multi
p
l
e values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John
Keeping
git-config:
u
pdate doc for --g
e
t with multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Jo
h
n
K
eeping
comp
l
etion: l
e
ar
n
about --man-p
a
th
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Ke
e
pi
n
g
compl
e
ti
o
n
: handle unstuck
for
m
of bas
e
g
it options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
h
n
Keeping
fast-impo
r
t:
a
llow moving th
e
root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
Ke
e
ping
fast-
i
mport
:
allow
ls or fileco
p
y of th
e
root t
r
ee
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
Keep
i
ng
fas
t
-import: set valid mode on
r
oot tree in
"l
s
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn Keeping
t9300: document f
a
st-import empty p
a
th issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
submodule: drop t
h
e top-
l
evel req
u
irement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
rev-parse: add --pref
i
x
o
ption
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
submod
u
le: show full path in error message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
t7403: add
m
issing && chai
n
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n
Keeping
t7403
:
mod
e
rnize styl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7401: make in
d
entat
i
on consist
e
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
mergetool
-
-
l
i
b: refactor
{
d
iff,merge}_
c
md logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
Document
a
tion/Mak
e
file: m
o
ve infod
i
r to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
e
eping
Documentation
/
M
a
kef
i
le:
f
ix spaces around assignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
add--interactive: respect diff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
Joh
n
K
e
eping
g
i
t
-
g
u
i
: f
i
x
file
n
a
m
e handling with non-emp
t
y pref
i
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John
Keeping
fetch: d
o
n't try to update unfetched
tracking re
f
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
Joh
n
K
eeping
difftoo
l
: f
i
x dir-diff w
h
en file
d
o
e
s
not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John
K
eeping
me
r
ge-tr
e
e
:
hand
l
e d
i
rectory/em
p
t
y
c
onflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
Joh
n
Keepin
g
t/Makefile: don't define TEST_RESULTS_DIRECTORY
recursiv
e
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
J
ohn Keeping
con
t
rib/subtre
e
: don't d
e
lete rem
o
te bran
c
hes if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
t
es
t
output: respect
$
T
E
S
T
_OUT
P
UT_DIREC
T
ORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keepin
g
t/Makefil
e
: remove smoke
test target
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merge-tree: fix typo
in "bo
t
h ch
a
nge
d
id
e
n
ti
c
ally"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t
/
M
akefile: f
i
x
result
handling with TEST
_
OUTPUT_DIR
E
CTOR
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transpo
r
t-helper: add 'sign
e
d-
t
ags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
epin
g
transport
-
helpe
r
: pass
-
-
si
g
n
ed-tags
=
wa
r
n-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepi
n
g
fas
t
-export: add --sign
e
d
-t
a
gs=warn-strip
m
o
de
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Keeping
t/test-li
b
.
s
h
: fix TR
A
SH_DIRECTORY han
d
ling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merg
e
-tree: don't
print entries th
a
t match "loc
a
l"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John
K
eeping
gitremo
t
e-helpers(1
)
: cla
r
ify refspec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n
K
eepi
n
g
submo
d
ule: pri
n
t graph output next to submo
d
u
l
e
l
og
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
Keepi
n
g
d
iff:
a
l
l
ow un
s
tuck argu
m
ents with
--diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keep
i
ng
git-merge(1)
:
d
ocum
e
nt diff-alg
o
r
i
t
hm
option to merg
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn
Kee
p
ing
bisect: avoid signe
d
integer overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Keeping
d
iffcore
-
break:
don't divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Keeping
t7
8
00: run --dir
-
d
i
ff t
e
sts wit
h
a
n
d without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: fix tests when
d
i
fftool uses --no-symlin
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t780
0
: don
'
t hide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
dif
f
tool:
d
on't ove
r
w
ri
t
e modi
f
ied files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
ing
t780
0
: move '--symlinks' spec
i
fic test to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John
K
eeping
merge-tr
e
e: fix
typo in merg
e
-tree
.
c::
u
nresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
J
ohn Keep
i
ng
refs
.
c: f
i
x
f
rea
d
err
o
r ha
n
dling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entry: fix fi
l
ter lo
o
kup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eeping
t2
0
03: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next