repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'mm/keyid-docs'
2015-09-11
Joh
n
K
e
e
p
ing
Docume
n
tation/git-rebase: fix --no-autostash fo
r
matt
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-11
J
ohn Keeping
rebase:
support --
n
o-auto
s
tash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-10
J
o
hn Keeping
Make
f
ile: fix MAKEFLAGS tests w
i
th
multiple flags
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
Joh
n
Keeping
i
n
terp
r
et-tr
a
i
lers:
a
llow running outside a rep
o
si
t
ory
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
Jo
h
n Keep
i
ng
test-lib-functions: detec
t
t
e
st_when_finished
i
n
subshe
l
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
Joh
n
K
e
epin
g
t
7800: don't use t
e
s
t
_config in a subs
h
ell
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
John Keeping
test-lib-func
t
ion
s
:
support "test
_
con
f
ig
-
C
<dir
>
.
.
.
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
John Keepin
g
t
5
801: don't use t
e
st_when_fini
s
h
ed in
a subshell
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
John Keeping
t7
6
10: d
o
n't use test_config
i
n a subshell
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John Keepi
n
g
t
6
300:
a
d
d
tests for "-lo
c
al" date for
m
at
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John Keeping
t
6300: mak
e
UTC and local
d
ate
s
diff
e
rent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
J
oh
n
Ke
e
pi
n
g
da
t
e: check for "l
o
cal
"
b
e
fore a
n
y
t
h
ing else
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John Keeping
t6300: add test for "raw" d
a
te fo
r
m
a
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John Kee
p
i
n
g
t6300: intr
o
duce test_da
t
e(
)
he
l
per
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John K
e
eping
Documentati
o
n/re
v
-list: don't list date for
m
ats
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
Jo
h
n Ke
e
ping
Document
a
tion/gi
t
-
f
o
r
-each-ref: don't
l
is
t
date formats
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John Keep
i
ng
Documentat
i
on
/
conf
i
g
:
d
o
n't li
s
t
d
a
te formats
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John Keeping
Documentatio
n
/blame-options: d
o
n
'
t
list date formats
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-03-31
John Keep
i
ng
stre
a
ming
.
c: fix a mem
l
eak
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
Jo
h
n
K
eepin
g
c
o
m
pletion: complete
`
g
i
t
p
u
s
h
--force-with-lease=
`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
J
ohn K
e
eping
compl
e
tion:
add some missing options t
o
`git
p
u
s
h
`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Kee
p
i
ng
completion:
complete "
u
nst
u
c
k
" `g
i
t push --re
c
urse
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
John Kee
p
ing
rebase: omit patch-identical commi
t
s with --
f
ork-poi
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
John Keepin
g
reb
a
se--am: use --cherry-pick instea
d
of
--
i
gnore-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
com
p
letion:
add missing
o
ptions f
o
r git-merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
co
m
p
letion: ad
d
a n
o
te
t
h
at mer
g
e
opt
i
o
n
s
a
r
e shared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
J
ohn Keeping
builtin/mv: f
i
x
out of b
o
und
s
wr
i
te
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
ohn
Kee
p
ing
builtin/
m
v: don't us
e
mem
o
ry after
f
r
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
o
h
n Keeping
utf8: us
e
c
o
r
r
ect type f
o
r values in interval tabl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Ke
e
ping
utf8: fi
x
ic
o
nv er
r
o
r
d
e
te
c
ti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
no
t
es-utils: ha
n
dle boolean notes
.
r
e
writemode correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John K
e
e
p
i
n
g
Make
f
ile: re
m
o
v
e
r
edund
a
n
t obj
e
ct in g
i
t
-
http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John Keeping
pull
:
s
uppress err
o
r when no remoteref is fou
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
Jo
h
n
K
eeping
completion: handle --[no-]
f
ork-poin
t
options to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
completi
o
n: c
o
mplete merge-base options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keeping
reb
a
se: fix fork-point with zero arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
Jo
h
n Keeping
rebase: use ref
l
og to
f
i
n
d
c
ommon base with u
p
str
e
a
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keeping
pul
l
: use
merg
e
-base --fork-point when
appro
p
r
iate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
peek-rem
o
te: remove deprecated
a
lias of ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
lost
-
found: remove de
p
rec
a
ted comma
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn
K
eepin
g
tar-tree: remove depre
c
ated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
h
n Keeping
rep
o
-config: remove
d
eprecat
e
d alias for "git
co
n
fig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
J
o
hn Keeping
D
ocumentat
i
on/Makefile: mak
e
As
c
i
i
Doc dbla
t
ex d
i
r configu
r
abl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John
Ke
e
ping
m
e
rge-recursive: fix parsing of "diff-algor
i
thm" o
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Jo
h
n Keeping
reset: ha
n
d
l
e submodule wi
t
h
t
ra
i
ling
slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
o
hn Keeping
r
m
: re-use par
s
e_
p
aths
p
ec's trailing-slash removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John
K
ee
p
ing
g
it_r
e
mote_helpe
r
s
:
remove lit
t
le
used Python lib
r
ary
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
r
e
v-parse(1):
l
og
i
c
ally group optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
ohn Ke
e
ping
rev-pa
r
se
:
r
emove re
s
t
r
i
c
t
ions on some o
p
tion
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
J
ohn Keeping
p
u
l
l: change
t
h
e description to "integrate
"
chan
g
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John K
e
e
p
ing
push: avoi
d
suggesting "merging" remote
changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
git-config(1):
clarify precedence of multiple
v
a
l
ues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keepin
g
g
it-config: update
d
oc for --get wi
t
h mul
t
iple va
l
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Kee
p
i
ng
compl
e
tion:
learn about --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
completi
o
n: handle unstu
c
k form o
f
base git option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Keeping
fast-impor
t
: allow moving the
r
o
o
t
t
ree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John K
e
eping
f
ast-import: allow ls or fi
l
ecopy of
t
he
r
oot tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn
Keeping
fast-import: s
e
t valid mode
on
r
oot tree in "ls
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t9
3
00: docu
m
ent fast-import empty path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n
Keeping
submodule: drop the top-level requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
rev-parse: add --pre
f
ix o
p
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keepi
n
g
submodule
:
show full pat
h
in err
o
r
me
s
sage
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
ng
t7
4
03
:
ad
d
m
i
s
sing &&
c
haining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
t74
0
3: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Ke
e
ping
t7401
:
make
indentation consis
t
ent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
ep
i
ng
mergetool--li
b
: ref
a
ct
o
r {diff,me
r
g
e}_
c
m
d logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
p
i
ng
Documentati
o
n/Makefile:
m
ove info
d
ir
t
o be with
oth
e
r
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keeping
Documenta
t
ion
/
Makefile: fix
s
paces around assignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John K
e
epin
g
add--interact
i
ve: respect di
f
f
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keeping
g
i
t-gui: f
i
x file name handling
with non-empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
f
e
tch
:
d
o
n
't try to update unfetc
h
ed tracking r
e
fs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John
K
e
eping
difftool
:
fix dir-diff
w
hen fil
e
d
oes not exis
t
i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
J
o
h
n Keeping
merge
-
tre
e
:
handle
d
irectory/empty c
o
nflict
c
orrect
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keep
i
ng
t/Mak
e
file: do
n
't defin
e
TEST_RESULTS
_
DIR
E
CTORY r
e
cursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
Jo
h
n Ke
e
ping
contrib/
s
ubtree: don't delete remote
branches if
split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test outp
u
t
:
r
esp
e
c
t $
T
EST_OUTPUT_DIRE
C
TORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Ke
e
ping
t
/
M
akef
i
le: remove smoke test
target
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
m
e
rge-tree: fix typo
in
"both changed
id
e
ntically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keepin
g
t/Makefi
l
e: fi
x
result handling
w
ith TEST_OUT
P
UT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
tr
a
nsp
o
rt-helper:
a
dd
'signed-tags' capa
b
ilit
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Keeping
transport-helper:
p
as
s
--signe
d
-
t
ags=warn-str
i
p to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn K
e
eping
f
a
s
t
-e
x
port
:
add --
s
igned-tags=warn-stri
p
mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
Keeping
t
/
test-lib
.
sh: f
i
x TRASH_DIRE
C
TORY ha
n
dli
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John K
e
e
ping
merge-tree:
d
on't print e
n
tries that match
"local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
J
ohn
K
eeping
gi
t
remote-help
e
rs(1)
:
clarify re
f
spec behav
i
our
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keepin
g
s
u
bmodule
:
print graph outpu
t
ne
x
t
to submod
u
le log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
h
n Keepi
n
g
diff: allow unstuck ar
g
ume
n
t
s
with --diff-alg
o
rithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
Keeping
git
-
merge(1): document d
i
ff-algorithm optio
n
t
o
merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
ohn
K
ee
p
ing
b
isect: avo
i
d signed intege
r
over
f
l
o
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
Keep
i
ng
diffcore-brea
k
: don'
t
divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn K
e
eping
t7800: run --dir-diff tests with and witho
u
t s
y
mlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: fix tests
when difftool uses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eeping
t
7
800: d
o
n't hide grep
output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Keep
i
ng
difftool
:
don't
over
w
ri
t
e modi
f
ied fil
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800
:
move '--symlink
s
'
sp
e
cific test to
t
he
e
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
Joh
n
Keepin
g
merg
e
-t
r
e
e
: fix
ty
p
o in merge-tree
.
c::unresolve
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
Joh
n
Keepin
g
refs
.
c: fix fread
e
rror h
a
ndling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
en
t
ry: fix filte
r
lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2003:
m
odernize st
y
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
h
n K
e
eping
difftool --dir-diff: symlink
a
ll fi
l
e
s
matc
h
ing the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next