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
Git 2.1
2014-07-22
John Keeping
c
o
mpleti
o
n: complete
`
g
i
t push --for
c
e-wi
t
h-lease=`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
Jo
h
n Keeping
completion:
a
dd
some missing op
t
ions to `gi
t
push`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Ke
e
pin
g
c
o
m
pleti
o
n: complete
"unstu
c
k" `git
push --recurse
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
John Keeping
reba
s
e: om
i
t patch-identi
c
al commits with --
f
ork-poin
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
John Keepin
g
r
e
base--am: use -
-
cherry-pick instead of --ign
o
r
e-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
J
o
hn Keeping
complet
i
on: add
m
issing
opt
i
ons
f
or
g
it-mer
g
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
J
ohn Keeping
c
omp
l
etion: add a not
e
t
hat merge op
t
i
ons
a
r
e
sh
a
red
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
J
o
h
n Keeping
builtin/mv:
f
i
x out of bounds wri
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keep
i
n
g
buil
t
in/mv
:
don't use me
m
ory after free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keep
i
ng
utf8: use correct type for values in interval table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf8:
fix iconv error
detection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
notes-utils: handle boolean
n
otes
.
rewritemode corre
c
tly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
Joh
n
Keeping
Makefil
e
:
r
emo
v
e redundant object in git-
h
ttp{f
e
tch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
J
o
hn Keeping
pull: suppress e
r
ror when n
o
remoter
e
f is
f
ound
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
Jo
h
n Keeping
c
ompl
e
t
i
o
n: ha
n
dle --[n
o
-]for
k
-po
i
nt options to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
completion: c
o
m
p
l
e
t
e merge-ba
s
e options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John
Keeping
rebase:
f
ix fork-point with zer
o
argum
e
nts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
J
ohn K
e
eping
rebas
e
:
us
e
re
f
log t
o
find
c
ommon
ba
s
e wit
h
upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keep
i
n
g
pull: use merge-base --fork-p
o
int when a
p
propriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keepi
n
g
peek-remote: remove dep
r
ecated alia
s
of ls-remo
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn Keeping
lost-fo
u
nd: re
m
ove dep
r
e
c
ated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn
Keeping
t
ar-tree: re
m
ove dep
r
e
cated comm
a
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
K
e
eping
repo-co
n
fig: remov
e
d
eprecate
d
ali
a
s for
"
git config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
J
o
hn
K
e
ep
i
ng
Documentatio
n
/M
a
kefil
e
: ma
k
e AsciiDoc dblatex di
r
conf
i
g
u
rable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John
Keep
i
ng
merge-recursive:
f
ix parsing
o
f "diff-algorithm" op
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
o
hn Keeping
reset: handle submodule with
t
ra
i
l
ing
slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Jo
h
n Keeping
rm:
re
-
use par
s
e_p
a
thspec
'
s trailing-
s
l
a
sh rem
o
val
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Keeping
git_remote_h
e
lpers
:
remove l
i
ttle used
P
ython library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John
K
e
e
ping
rev-p
a
rse
(
1): logically group op
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John K
e
eping
rev-pa
r
s
e: rem
o
ve
restriction
s
o
n som
e
option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
p
u
ll:
c
han
g
e the description
t
o
"
integrate" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Ke
e
p
ing
push: avoid s
u
gge
s
ting "
m
ergi
n
g" remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
K
eepi
n
g
git-config(
1
):
c
larify precede
n
ce o
f
m
u
ltiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
J
ohn Keepi
n
g
git-config: update d
o
c for --get with mu
l
t
iple value
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
ohn Keeping
compl
e
tion:
learn about -
-
man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Jo
h
n Keepin
g
completion: handle
u
nstuc
k
for
m
of
base git opt
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn Kee
p
i
n
g
fa
s
t-import: allow
m
o
v
ing the root
tre
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-impor
t
: allow ls or f
i
lecopy
o
f
t
h
e root tr
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
eeping
f
a
s
t
-
impor
t
: se
t
valid m
o
de on roo
t
tre
e
in
"
ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn Keepin
g
t9300: document fast-imp
o
r
t
empty
p
at
h
issue
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
su
b
module
:
d
rop
t
he top-level re
q
uir
e
ment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
rev-par
s
e
: add --pref
i
x option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn
Keepin
g
submodule: show fu
l
l
path in erro
r
mess
a
ge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eepin
g
t
7
403:
a
dd missing
&
& chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keepi
n
g
t7403: modernize sty
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
p
i
ng
t7401: make ind
e
ntation con
s
isten
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
mergetool--lib: refactor {diff
,
merge}_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Documentation
/
Makef
i
le: move i
n
fodir
t
o be wit
h
othe
r
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
e
epin
g
Docum
e
ntation/Makefile: fix s
p
a
c
e
s
around assignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
Joh
n
Keep
i
ng
add--interactive
:
respect diff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keepin
g
g
i
t
-gui
:
f
i
x
f
ile nam
e
hand
l
ing with non-e
m
pty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
J
o
hn Keeping
fet
c
h:
d
on'
t
try to
u
pdate unfe
t
ched tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keepi
n
g
difftool: fix
d
i
r-diff w
h
en file does not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-tree: handle d
i
rector
y
/empty c
o
nf
l
ic
t
co
r
r
e
ctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keep
i
ng
t
/Makefile: don't
d
ef
i
ne TEST_RESULTS
_
DIRECTORY recursi
v
ely
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keepi
n
g
contrib
/
subtr
e
e: don't delete
remote b
r
anches if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test output: resp
e
c
t
$TE
S
T_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keepin
g
t/M
a
kefil
e
: rem
o
ve smoke te
s
t targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Joh
n
Kee
p
ing
m
e
rg
e
-tree: fix t
y
p
o
in "both c
h
a
n
g
e
d
identicall
y
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John
K
ee
p
ing
t/M
a
kefile:
f
i
x
result handling with TEST_OUTP
U
T
_
DIRE
C
TORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn
K
eeping
t
ransport-helper:
a
d
d
'si
g
ne
d
-
tags'
c
apab
i
lity
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
in
g
transport-h
e
lp
e
r
:
pass
-
-signed-tags=warn-
s
trip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
p
ing
fast
-
expo
r
t: a
d
d -
-
signed-tags=warn-strip
m
ode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n Keeping
t/te
s
t-l
i
b
.
sh: f
i
x TRA
S
H_DIR
E
CTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
J
o
hn Keeping
merge-tree:
d
o
n
'
t
print entries that match "loca
l
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
J
o
hn Keeping
g
itremot
e
-he
l
pers(1): clarify r
e
fspec behav
i
our
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
Keeping
s
u
bmo
d
u
l
e: pri
n
t graph outpu
t
next
to subm
o
dul
e
log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n Keeping
d
i
f
f
:
allow unstuck
a
rgument
s
with --dif
f
-a
l
g
orithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
git-m
e
rg
e
(1)
:
doc
u
ment diff-algorithm option to mer
g
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
ohn Keep
i
ng
bisect: avoid
signed integer
o
verflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
Keeping
diffcor
e
-break:
d
on
'
t divide b
y
z
ero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t
7800
:
run --dir-diff
t
ests
with and without symli
n
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keep
i
ng
t7
8
00: fix tes
t
s whe
n
d
i
fftool uses --no-
s
yml
i
n
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: d
o
n't
h
ide
g
r
ep out
p
u
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn
Keeping
difftoo
l
:
don't overwrite modified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keeping
t7800: move
'
--symlinks' s
p
e
c
i
f
ic test to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
Joh
n
K
e
eping
merge
-
tree: fi
x
typo
i
n
merg
e
-t
r
ee
.
c:
:
u
n
resolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
J
ohn Keeping
refs
.
c: f
i
x
fread er
r
or hand
l
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
entry: fix filter l
o
okup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
e
e
p
i
n
g
t200
3
:
m
odernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
e
eping
difftool --di
r
-
d
i
ff: sy
m
l
ink all file
s
matc
h
i
ng the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eepi
n
g
difftool: avoid
d
oub
l
e s
l
ashes
in symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
git-difftool(1): fix formatting o
f
--symli
n
k descrip
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Kee
p
in
g
Reve
r
t "gr
a
p
h
.
c: mark p
r
i
vate file-
s
cope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John
K
eepin
g
M
ak
e
file: make mandir, htmldi
r
and infodir absol
u
te
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
r
e
b
a
s
e
-i: resp
e
ct core
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
combi
n
e-diff
.
c: teach com
b
ined diffs about line p
r
efix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c
:
use diff_l
i
ne_pr
e
f
i
x() where appli
c
a
b
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
in
g
diff
:
a
d
d
d
if
f
_line_pr
e
f
ix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
diff
.
c: m
a
ke con
s
tant string ar
g
umen
t
s const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn
Keeping
diff: writ
e
prefix to the correct
file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
g
r
aph: output
p
a
d
d
ing fo
r
merge subsequ
e
nt parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
o
hn
Keeping
t4038
:
add tests
for "
d
iff --cc -
-
raw <tre
e
s
>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Ke
e
ping
builtin/app
l
y:
t
ight
e
n (di
s
)s
i
m
il
a
rity in
d
ex parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
mergetool
-
-lib: list user c
o
nfig
u
red tool
s
in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
Jo
h
n
K
eeping
Rename {gi
t
- => git
}
remote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
Coding
G
uideli
n
e
s
:
a
dd P
y
t
h
on
c
o
din
g
g
ui
d
elines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-re
m
ote-te
s
tpy:
f
ix path hashing
o
n Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keepin
g
mergetool--lib: don't call "exi
t
"
in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git-di
f
fto
o
l: use git-mergetool--lib for "--tool
-
h
e
l
p"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next