repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
send-pack: move REF_STATUS_REJECT_NODELETE logic a bit higher
2014-07-22
John K
e
eping
completio
n
: comp
l
ete `git push
--force-with-lease=`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Ke
e
ping
co
m
plet
i
o
n
:
add so
m
e
missing op
t
ions to `git push`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
J
o
hn Keepin
g
comple
t
i
o
n: com
p
lete "unstuck"
`
g
i
t push
--recurse
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
Joh
n
Keeping
re
b
ase: omit patch
-
iden
t
ical com
m
it
s
with --fork-point
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
John Keeping
re
b
ase-
-
am: use --cher
r
y-pick instead of --ignore-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
J
ohn
Keeping
complet
i
o
n: ad
d
missing opti
o
ns for git
-
merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
Joh
n
Keeping
c
ompleti
o
n
:
add
a
no
t
e that
merg
e
o
ptions are shar
e
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John Keeping
buil
t
in/mv:
f
ix
o
u
t
o
f
bounds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John
K
eeping
builtin/
m
v:
d
on't use
memory after f
r
ee
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf8: use correct typ
e
for value
s
in inter
v
al ta
b
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keepi
n
g
u
t
f8
:
f
i
x iconv error detection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
n
otes-utils:
h
andle bool
e
an notes
.
r
ewritemode cor
r
e
c
t
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John Keeping
Makefile: remove re
d
undan
t
object in git-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John
Keeping
pull: s
u
p
p
r
ess e
r
ror when
no remoteref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
completio
n
: han
d
le --[n
o
-
]
fo
r
k-poi
n
t op
t
ions
t
o
git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
o
hn Keeping
completion: complete
merge-base opt
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
Jo
h
n Keeping
r
e
base: fix fork-point with
z
e
ro arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
J
o
hn Keeping
rebase
:
use reflog to find common base
with ups
t
r
e
am
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keepin
g
pull:
use merg
e
-base -
-
f
ork-point when appropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Jo
h
n
K
eeping
peek-re
m
ote: remove dep
r
ecated ali
a
s
of ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
l
o
st-found:
remove de
p
re
c
ated co
m
ma
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John K
e
eping
tar-tree:
r
emov
e
de
p
recated comm
a
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John K
e
eping
repo-confi
g
: remov
e
depr
e
c
a
ted alias fo
r
"git confi
g
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keepi
n
g
Docume
n
tation/Makefile: mak
e
Asci
i
D
o
c dblate
x
dir con
f
igurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Ke
e
pin
g
merge-rec
u
rsive: fi
x
parsing of "diff-algorithm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Joh
n
Keeping
re
s
et:
h
an
d
le s
u
b
m
od
u
le with trailing slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John
Keeping
rm: re-use p
a
rse_pathsp
e
c's t
r
ailing-slash r
e
moval
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John
K
e
epi
n
g
git_rem
o
te_help
e
r
s
:
re
m
ove little u
s
ed Python
l
i
brary
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keep
i
ng
rev-parse(1): l
o
gically gr
o
up options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
Joh
n
Keep
i
ng
rev-
p
a
r
se: remove restrictions
o
n
some o
p
tions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keepi
n
g
pul
l
: change t
h
e descri
p
tion
t
o
"integrate" ch
a
nge
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keep
i
ng
pu
s
h: avoid
s
uggesting "me
r
ging" remote cha
n
ges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Joh
n
K
e
eping
git-confi
g
(1): clar
i
f
y
p
r
e
cedence o
f
multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
Jo
h
n Keeping
git-config: u
p
date doc f
o
r
-
-
get with
mul
t
iple
v
alues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
ohn
K
e
e
ping
c
o
m
p
letion: learn about
-
-man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keepi
n
g
completion: handle un
s
t
uck form of base git optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn Keepi
n
g
fa
s
t-imp
o
rt: all
o
w moving the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-impor
t
: allow ls or filecopy
of the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Kee
p
ing
fast
-
imp
o
rt: s
e
t
v
a
lid mode on root tr
e
e
in "ls
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
e
e
pin
g
t
9
3
0
0
:
document fast
-
im
p
or
t
empty path iss
u
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule:
d
r
op th
e
top-level require
m
ent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
rev-parse: add --pref
i
x option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
submo
d
ule: show full
path i
n
err
o
r mes
s
a
g
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepin
g
t7403: add missin
g
&& chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
t7403: modern
i
ze
s
tyle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n
Keeping
t7401: ma
k
e inden
t
a
tion consis
t
ent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
m
e
rgetool-
-
lib: refactor {diff
,
merge}_c
m
d logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
Documentation/Makefil
e
: move infodir to be wit
h
oth
e
r
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
e
ep
i
ng
Documentation/Makef
i
le:
f
ix spaces around
a
ssign
m
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John K
e
eping
add--int
e
ra
c
tive: respect diff
.
algorith
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keepin
g
gi
t
-gui: fix fil
e
name h
a
ndling wit
h
non
-
em
p
ty pre
f
i
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
Joh
n
Keepin
g
fe
t
c
h: don
'
t try to update unfetched tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keepi
n
g
difftool
:
fi
x
dir
-
diff
w
h
e
n file does no
t
ex
i
st
in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
J
o
hn Kee
p
i
n
g
merg
e
-
t
ree:
handl
e
director
y
/
e
mpty co
n
flict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
Joh
n
Keeping
t/Makefile: don't
defi
n
e
TES
T
_
R
E
SULTS_
D
I
R
ECTORY recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Ke
e
pi
n
g
c
o
n
t
ri
b
/
s
ubt
r
ee: don't delete
r
em
o
te branc
h
es if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
Joh
n
K
eeping
te
s
t output: respect $TEST_OUTPU
T
_
D
IRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Joh
n
Keepi
n
g
t/Makefil
e
:
r
emove
smoke test targe
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merge-tree: fix typo in "b
o
t
h changed identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
Jo
h
n Keeping
t/Ma
k
efile: fix r
e
sult handling with TE
S
T_OUTPUT
_
D
I
RECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eeping
transport-helper: add 'signe
d
-ta
g
s' c
a
p
ability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
tra
n
sport-helper: p
a
s
s --sig
n
ed-tags=warn-strip
t
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
ing
f
as
t
-
e
x
p
ort: add --signed-tags=
w
arn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepi
n
g
t/t
e
st-l
i
b
.
sh: fix TRA
S
H_DI
R
ECTORY han
d
ling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
Joh
n
Keeping
merge-tre
e
:
don't print entries that matc
h
"local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
Joh
n
Keeping
g
i
tremote-
h
e
lpers(1
)
:
c
la
r
ify refspec b
e
h
a
viour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
submodule: pr
i
nt gr
a
ph outpu
t
next to
submodu
l
e lo
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Ke
e
ping
diff: allow unstuck
arg
u
ments wi
t
h --diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
g
i
t-
m
erge(1): document
diff-algorithm opti
o
n to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Ke
e
ping
bisect: avo
i
d
s
i
g
ned integer over
f
low
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
diffcore-break: don'
t
d
i
vide by
z
e
ro
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t
7
800: run --dir-
d
iff tes
t
s wi
t
h
a
nd
without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keep
i
ng
t7
8
00:
fix
tests when
d
ifft
o
ol us
e
s
--no
-
symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: d
o
n't h
i
d
e
g
r
ep o
u
t
p
ut
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keep
i
ng
difftool:
don't o
v
erw
r
ite mo
d
ified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
epi
n
g
t7800:
m
ove '--sym
l
i
nks'
specific
t
est to the e
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
merge-tree: fix typo in merge-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John K
e
eping
r
e
f
s
.
c: fix
f
read er
r
or han
d
ling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keep
i
ng
entry: fix filt
e
r
lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
t2003: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool --dir-diff: symlink all files ma
t
ching t
h
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
h
n Keepi
n
g
di
f
f
t
ool: avoid do
u
ble
slas
h
e
s
in
symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
p
i
n
g
git-dif
f
t
o
ol(1):
fix fo
r
mattin
g
of --symlink description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Re
v
e
r
t
"
g
raph
.
c
:
mark private file-scope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keepi
n
g
Makef
i
le:
m
a
ke mandir
,
html
d
ir and in
f
odir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
rebase -i: re
s
pect core
.
com
m
entchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
combine-di
f
f
.
c
: teach combined d
i
f
f
s
a
bout
l
in
e
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
diff
.
c: use
diff
_
line_
p
refix(
)
w
h
e
r
e
app
l
icable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: add diff_line_pr
e
fix
f
un
c
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
iff
.
c
:
make constant string
arguments cons
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n
Keepi
n
g
diff: write p
r
efix to the cor
r
ect file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John
K
e
e
pi
n
g
graph: output p
a
dding
for
m
erge s
u
b
sequent paren
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
o
hn K
e
epi
n
g
t4038: add tests fo
r
"diff --cc --raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin/apply: tight
e
n
(
di
s
)
similarity index pars
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keep
i
ng
mergetool--lib: li
s
t
use
r
co
n
f
i
gu
r
ed tool
s
i
n '-
-
tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Rename
{
git- => git}remote-helpers
.
t
x
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
CodingGuidelines: add Pyt
h
on coding g
u
idelines
commit
|
commitdiff
|
tree
2013-01-28
John Kee
p
i
n
g
git-remote-t
e
stpy: fi
x
path ha
s
hi
n
g on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
Joh
n
Ke
e
ping
mergetool--lib: d
o
n't
call "
e
xit" in set
u
p_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-difftoo
l
: us
e
git-mergetool--lib for "--tool-hel
p
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next