repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jk/command-line-config-empty-string'
2014-07-22
Joh
n
Keepin
g
comp
l
e
t
io
n
: complete `git push --force-with-lea
s
e=`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
J
ohn Keepin
g
completion: add some missing options to
`git pus
h
`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
J
ohn Keeping
c
o
mplet
i
o
n
: co
m
p
l
ete "unst
u
ck" `git
pu
s
h --r
e
cur
s
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
J
o
hn Ke
e
p
i
ng
rebase: om
i
t patch-ident
i
cal comm
i
ts with --fork-point
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
John
Keeping
r
e
base--am: use --cher
r
y-pick instead of --i
g
nore-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Ke
e
p
i
ng
completion:
a
dd mis
s
ing options for git-merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
completi
o
n
:
add a note that me
r
ge options are
s
hared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John
K
eepi
n
g
builti
n
/mv
:
f
i
x
o
ut of boun
d
s write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
builtin/m
v
: don't
use
memo
r
y
a
f
ter free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John
K
eeping
utf8: use co
r
r
ect typ
e
f
or v
a
l
ues i
n
interval table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf8: fix ico
n
v error
detec
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Joh
n
Keeping
note
s
-
utils: handle boolean notes
.
rewri
t
emode
c
orre
c
tly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
J
o
hn Keeping
Makefile: remov
e
redundant
o
bject in
git-http{fet
c
h
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
Joh
n
Keepi
n
g
pull: suppre
s
s
error when n
o
r
emoter
e
f is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John
K
eeping
comp
l
eti
o
n: handle --[no-]
f
o
rk-point op
t
ions t
o
git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John
K
eeping
completion: com
p
l
ete merge-bas
e
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Ke
e
ping
rebase: f
i
x fork-point
w
ith zero arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
J
o
hn Kee
p
ing
rebase: use reflog t
o
find common base with upst
r
eam
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
J
ohn K
e
eping
p
u
ll: use merge-ba
s
e --fork-point when appropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Ke
e
ping
peek-remote
:
r
e
move deprecated alias of ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Ke
e
ping
lost-found: re
m
ove
depre
c
a
t
e
d
command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Joh
n
K
eeping
tar-tree: remove deprecated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
repo-config: remove depr
e
cated
alias for
"git con
f
ig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
Jo
h
n
K
e
eping
Docum
e
ntation/Makefi
l
e:
make AsciiDoc dblat
e
x dir configurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Kee
p
ing
mer
g
e-recursi
v
e: fix parsing of "diff-
a
lgo
r
ithm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keep
i
ng
reset: handle submodule
w
ith
t
railing slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm: re-u
s
e p
a
rse_pathspec's trailing-slash re
m
o
v
a
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
J
ohn Keeping
g
i
t_
r
emote_helpers: rem
o
ve little u
s
e
d Python library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
Joh
n
Keeping
rev-parse(1):
l
ogi
c
ally group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
oh
n
Keeping
rev-
p
arse:
remove re
s
t
ric
t
ions on some options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keepin
g
p
ull
:
c
hang
e
th
e
d
escr
i
ption
t
o "integrate" cha
n
ges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Joh
n
Keep
i
n
g
push:
a
void suggestin
g
"merging" remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keep
i
ng
g
i
t-config(
1
): clar
i
fy pr
e
ced
e
nc
e
of
m
ultiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
Joh
n
Keeping
g
it
-
config: update doc
f
o
r --
g
et with m
u
lti
p
le values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John
K
eeping
completion: learn about --
m
an-
p
ath
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Joh
n
Keeping
com
p
le
t
ion: handle unstuc
k
form
of bas
e
git optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Ke
e
pin
g
fast-imp
o
rt: allow moving the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Keeping
fa
s
t-import:
a
l
l
ow ls or
f
i
lecopy of the
r
oot
tre
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
eeping
fas
t
-
i
mport: set valid mode on
root tree in
"ls
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n Keeping
t
9300: d
o
cument
fast-import e
m
pty path is
s
u
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
submodule: dr
o
p the top-level requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
p
ing
rev-parse: add
-
-prefix opti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule: show full path in error message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
t7403
:
add missin
g
&& chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t740
3
: m
o
de
r
niz
e
st
y
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn
K
e
eping
t7401: make i
n
dentat
i
on c
o
nsiste
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
m
e
rgetool--lib:
refac
t
or {diff,merge}_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keepi
n
g
Docum
e
ntati
o
n/Makefile: mov
e
infodir to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
ng
Docu
m
entation/M
a
kefil
e
: fi
x
spaces aro
u
nd assignment
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
a
d
d--interactiv
e
: respect diff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
J
o
hn Keeping
g
it-g
u
i
: fix file n
a
me ha
n
dling with non-empty pr
e
fi
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
fe
t
ch:
d
o
n
'
t try to update unfetched tracking
ref
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Kee
p
ing
difftool: fix dir-diff when file do
e
s not exi
s
t in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-tree:
h
an
d
l
e directory/empty
conflict
cor
r
ec
t
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keepin
g
t/Makefile: don't define TEST_RE
S
U
L
TS_DI
R
ECT
O
RY
recursive
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
contrib/s
u
b
tree: don't delet
e
remot
e
b
r
anche
s
if s
p
lit
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
J
ohn Keeping
te
s
t
output: respect $TES
T
_
O
UTPUT_D
I
R
E
CTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keep
i
n
g
t/Ma
k
efile: remove smoke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
ohn Keeping
mer
g
e-tree: fix t
y
p
o
in "bo
t
h changed iden
t
i
c
a
lly"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t/Makefile: fix
r
e
sult handling with TEST_OUTPUT_DI
R
ECT
O
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
eping
transport-h
e
lper
:
a
dd 'signed-
t
ags
'
capa
b
ility
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eep
i
ng
transport
-
helpe
r
:
pass --signed-tags=warn-s
t
r
i
p
t
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
h
n Keeping
fas
t
-
e
xport: ad
d
--signed-t
a
gs=wa
r
n-str
i
p m
o
de
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/test-lib
.
sh: fix TRASH_DIREC
T
OR
Y
handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John
K
eeping
m
erge-tr
e
e
: don't print
e
ntries th
a
t
ma
t
ch "lo
c
a
l"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John
K
eeping
gitr
e
mote
-
helpers(1): clarify refspec
behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
subm
o
dule: print gr
a
ph output next to sub
m
o
d
u
l
e
lo
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n K
e
eping
diff: allow
u
nstuck ar
g
uments with -
-
di
f
f-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
g
it
-
merge
(
1): d
o
cument diff-a
l
gorithm option to
m
erge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisect: a
v
oid signed integer overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn Keeping
diffco
r
e-bre
a
k: don't
divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eeping
t7800: run --di
r
-di
f
f
t
ests with an
d
without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: f
i
x tests
w
hen difftool uses --
n
o
-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eepin
g
t7800: don't
hid
e
grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Ke
e
ping
difftoo
l
: do
n
't overwrite modified f
i
les
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
i
ng
t780
0
: move
'--symlink
s
' specific test to th
e
end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
Jo
h
n Keeping
merge-tree: fix t
y
po in merg
e
-
t
r
ee
.
c::unreso
l
ved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c:
fix fread error h
a
nd
l
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eeping
ent
r
y: fix filt
e
r lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Keeping
t2003: modernize
sty
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keep
i
ng
d
iff
t
o
o
l --di
r
-diff: sy
m
l
ink a
l
l files
m
at
c
hi
n
g the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
ep
i
ng
difftool: av
o
id double slashes in syml
i
nk tar
g
e
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-difftool(1): fix for
m
a
tting of --symlink
d
escription
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
Joh
n
Keep
i
ng
Re
v
ert "
g
raph
.
c: mar
k
private
f
ile
-
scope symbols
a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John
K
eeping
Makefi
l
e: make mandir, ht
m
ldir and
i
nf
o
di
r
absolu
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
rebase
-i:
r
e
s
p
ect core
.
com
m
entchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
combine-diff
.
c: teach
c
o
m
bined diffs about
l
ine
p
refix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eepin
g
diff
.
c: use diff
_
line_prefi
x
() where applic
a
ble
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
d
i
ff: add diff_line_prefix
f
u
ncti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
i
ng
diff
.
c:
make con
s
tant string ar
g
u
men
t
s const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
d
iff: w
r
it
e
prefix to t
h
e corre
c
t file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John
K
eeping
graph: output padding for me
r
ge subsequent
pare
n
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Ke
e
ping
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
J
o
hn Ke
e
p
i
ng
bu
i
ltin/apply: tighten
(
dis)similarity index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
merge
t
ool--lib:
l
ist user conf
i
gured tools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John
K
e
e
p
i
n
g
Renam
e
{git- =>
g
it}remote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
Codin
g
Gu
i
del
i
nes: add Python coding
g
uid
e
lines
commit
|
commitdiff
|
tree
2013-01-28
John Kee
p
i
n
g
git-r
e
mote-testpy: fix path h
a
shi
n
g on Py
t
h
on 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
Joh
n
Keeping
merge
t
ool--lib: don't call "exit" in se
t
up_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-
d
iff
t
ool: use git-
m
e
r
getoo
l
--lib
f
o
r
"--tool-hel
p
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next