repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
completion: add some missing options to `git push`
2014-07-22
John
Keeping
completion
:
ad
d
some missin
g
opti
o
n
s
t
o
`
gi
t
push`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John K
e
eping
completion
:
c
o
mplete "unstu
c
k" `git pu
s
h --rec
u
r
se
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
Jo
h
n Keepi
n
g
c
o
mpletion: add m
i
ssing
o
ptions for git-merg
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
Jo
h
n K
e
eping
completion: a
d
d a note that mer
g
e optio
n
s are shared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John Keepi
n
g
builtin/mv:
fix out
o
f
bounds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John
Keeping
buil
t
in/m
v
: do
n
't use memory after f
r
ee
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Kee
p
ing
utf
8
:
use cor
r
ect ty
p
e for values in interv
a
l tab
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Joh
n
Kee
p
ing
utf8: f
i
x iconv error
d
etection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Kee
p
i
n
g
notes-u
t
il
s
: han
d
le boolean notes
.
rewritemode correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
Jo
h
n Keeping
Makefi
l
e:
r
emove re
d
undant object in git-http{
f
etch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
J
o
hn Keepi
n
g
pu
l
l
:
sup
p
r
e
s
s error w
h
en n
o
rem
o
t
eref i
s
found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keepin
g
compl
e
tion: hand
l
e --[no-]fo
r
k-po
i
nt options to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
com
p
l
etion: complete merge
-
base optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John K
e
e
p
ing
rebase: fix f
o
rk-
p
oint with zer
o
arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John K
e
eping
rebase: use refl
o
g t
o
fin
d
common ba
s
e
w
ith upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
J
o
h
n Keeping
pull
:
use merge-base --for
k
-
point when appropria
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Ke
e
pin
g
peek-remote: remove depreca
t
ed a
l
i
a
s of
l
s-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Joh
n
Keepin
g
lost-found:
r
emov
e
depr
e
c
a
ted command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Joh
n
Keeping
tar-tr
e
e: remove
deprecated c
o
m
m
and
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
re
p
o
-config: remove deprecate
d
al
i
as for "git config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John
Keeping
Documentatio
n
/Ma
k
efile: make
AsciiDoc dblat
e
x
d
i
r
conf
i
g
u
rable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
J
o
hn Keeping
merge-recu
r
siv
e
: fix pars
i
ng of "
d
iff-algorithm"
option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
reset: h
a
ndle s
u
bmodule with trailing
s
l
ash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John K
e
eping
rm: re-use
p
arse_
p
athspec's trailing-slash removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
Joh
n
Keeping
git_remote_helpers: remove little used Python library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-parse(1)
:
logically gr
o
up
op
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keep
i
ng
r
e
v-
p
a
rse:
r
emove
restrictions
on some opt
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pull: change
the desc
r
iption
t
o "integrate" cha
n
ges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
push: avoid suggesting "merg
i
ng" remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
git-config(1): clarify
p
rec
e
d
e
nce o
f
multiple valu
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
git-conf
i
g: update
doc for
-
-get with multiple val
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
ohn K
e
eping
completion:
learn ab
o
ut --ma
n
-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
completion: handle uns
t
uck f
o
rm of base git
o
p
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Keeping
fa
s
t-import: allow moving the ro
o
t
tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Keeping
fast
-
im
p
ort:
a
llow ls or fi
l
eco
p
y of the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Ke
e
ping
fa
s
t-import: set valid mo
d
e on r
o
ot
t
ree i
n
"ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John K
e
eping
t93
0
0: document fast-impo
r
t emp
t
y
pa
t
h is
s
ues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n
Keeping
submodule:
d
rop
t
he t
o
p-level requi
r
eme
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
rev-parse: add --p
r
efix o
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
i
ng
submodule: show full path in error message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
e
e
p
i
ng
t7403: add mis
s
ing &&
ch
a
ining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t
7
403: moder
n
ize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
t7401: make ind
e
nt
a
tion consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
mergetool--l
i
b: re
f
ac
t
o
r
{
d
iff,merge}_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n
Keeping
Docu
m
entatio
n
/
M
a
k
efile:
move
i
nfodir to be with ot
h
er
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Documentatio
n
/Mak
e
file:
f
ix
s
paces ar
o
u
nd assi
g
nm
e
nts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
J
o
hn Keeping
add--interactive:
respe
c
t diff
.
al
g
orith
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keep
i
n
g
git
-
gui: fi
x
file
name handling
w
i
t
h
non-empt
y
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
J
ohn Keeping
fe
t
ch: don't try to upd
a
te
unfetched
t
rack
i
ng refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keep
i
ng
difftool:
fi
x
dir-diff
w
h
en
file does not
exi
s
t in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
me
r
g
e
-
t
ree
:
ha
n
dle directory/
e
mpty
co
n
flict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John
K
e
e
ping
t/
M
a
kefile: don'
t
define TEST
_
RESULTS_DIR
E
C
T
O
RY recursive
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
J
o
h
n
K
eeping
contrib/subtree:
don't delete remote branch
e
s if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test
o
u
tput: respec
t
$TEST_OUTP
U
T_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Ma
k
efile: remove sm
o
k
e
t
est
t
a
rgets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Kee
p
ing
merge-tree
:
fix typo in "both changed i
d
entically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keep
i
n
g
t/Mak
e
f
i
le: fix resu
l
t
han
d
ling with TEST_OUT
P
UT_DIRECTOR
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
ep
i
ng
t
r
a
nsport-
h
e
l
per: add
'
signed-tags'
ca
p
ability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transport-helper: pass --signe
d
-tags=war
n
-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
ping
fast-exp
o
rt: add --
s
ign
e
d
-
tags=
w
arn
-
strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
/
t
est-lib
.
sh: fi
x
TRASH_DIRECT
O
RY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John
K
e
e
ping
m
e
rge-tree: don't print e
n
tries th
a
t
m
atch "
l
ocal"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
g
itremo
t
e-hel
p
ers(1):
c
larify refspec
behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n
Keepi
n
g
submodule: print graph output next to submodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
diff: allow
uns
t
uck argume
n
ts with --di
f
f-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
Ke
e
ping
git-
m
erge(1): d
o
cument diff-algorith
m
option
t
o merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisect: avoid si
g
ned inte
g
er over
f
low
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Keeping
dif
f
core-break: don't divide b
y
zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Ke
e
ping
t780
0
: run --dir-diff
tests with and without s
y
mlin
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
t
7800: fix tes
t
s when diff
t
o
ol uses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keep
i
n
g
t7800: don'
t
hide
g
rep out
p
ut
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
d
i
fftool:
d
on't
overw
r
ite mo
d
if
i
ed files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: move
'-
-
syml
i
nks' specific test t
o
the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
merg
e
-tr
e
e: fix typ
o
i
n
m
erge-tree
.
c:
:
unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Kee
p
ing
refs
.
c: fi
x
f
r
ea
d
error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
e
ntry: f
i
x fi
l
ter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2003:
m
o
dernize
st
y
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
difftoo
l
--dir-diff:
symlink
all fi
l
es matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool
:
avoid doubl
e
slashe
s
in symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
gi
t
-d
i
fftool(1): fix
formatting of --sy
m
li
n
k
description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
Jo
h
n
Keeping
Rev
e
rt
"graph
.
c: mark private file-scope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Makefile: make mandir, htmldir and infodi
r
abs
o
l
ute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
e
ep
i
n
g
r
ebase -i: res
p
ect cor
e
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
c
o
mbine-diff
.
c: teach
co
m
bined diffs about
line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
diff
.
c: use d
i
ff_li
n
e_
p
refix() w
h
e
re
applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
diff: ad
d
diff_line_prefix
fun
c
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
e
e
pin
g
di
f
f
.
c
: m
a
ke
constant string ar
g
um
e
nts
c
o
nst
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: write
pref
i
x
t
o t
h
e
c
orr
e
ct f
i
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
g
r
a
ph: out
p
ut paddin
g
for merge subsequent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
Jo
h
n K
e
eping
t4038: add test
s
f
o
r
"
diff --cc --raw
<
trees>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
Keeping
builti
n
/apply: t
i
g
hten (dis)similarit
y
inde
x
p
arsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
Keep
i
ng
me
r
ge
t
ool-
-
lib: list user configured
t
o
ols in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
o
hn Keeping
Rename {git
-
=
>
gi
t
}
remote-helpers
.
tx
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
C
odingGuidel
i
nes: a
d
d Python codin
g
guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-r
e
mote
-
testpy: fix
p
ath hashing on P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
Joh
n
Keeping
mergetool--lib:
don't call "exit"
i
n setup
_
tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keep
i
ng
git-difftool
:
use git-merg
e
tool--lib for "--
t
ool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-merge
t
ool: don't hardcode 'm
e
rgetool' in show_tool
_
h
e
lp
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-
m
ergetool: remove redu
n
dant
assig
n
ment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
g
it-mergeto
o
l:
mov
e
s
h
o
w
_
t
ool_help to mergetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next