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
update-ref --stdin: pass transaction around explicitly
2014-05-27
John K
e
epi
n
g
completi
o
n: add missing o
p
tio
n
s for git-
m
e
r
ge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
completion
:
add
a
n
o
te that merge opt
i
o
n
s are
s
hared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
J
o
hn Keeping
bui
l
tin/
m
v: fix out of bounds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John
Keeping
builtin/mv: don't use memory
after free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Ke
e
ping
utf8: use co
r
r
e
ct type for value
s
in interval table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
u
tf8:
fix
i
conv e
r
ror det
e
ction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
n
otes-utils: hand
l
e boole
a
n
notes
.
r
e
writemode correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
Jo
h
n Keeping
M
a
kefile:
rem
o
ve re
d
undant obje
c
t in git-ht
t
p{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John K
e
eping
pull:
s
uppr
e
s
s
error when no remotere
f
i
s
found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keep
i
ng
completi
o
n: handle --[no-]fork-poi
n
t
opti
o
ns to g
i
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Ke
e
ping
c
omple
t
ion: co
m
pl
e
te
m
erge
-
base
o
ptions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keepin
g
rebase: fix for
k
-p
o
int with z
e
ro arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
J
ohn
K
eeping
rebas
e
: use r
e
flog to
f
i
n
d commo
n
base with
u
ps
t
ream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
J
ohn Keeping
pull:
u
s
e merge-base -
-
fork-po
i
nt when appr
o
pri
a
te
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
K
eeping
pee
k
-remote: remov
e
deprecated
a
lias of ls
-
r
e
m
ote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Kee
p
i
n
g
lost-found: remove
deprec
a
ted
c
om
m
and
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
tar-tr
e
e: remove dep
r
ec
a
ted
c
ommand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
re
p
o-config:
r
emov
e
deprecated ali
a
s for "git
c
o
nfig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keep
i
ng
Documentation/Make
f
ile: make A
s
cii
D
o
c
dbla
t
ex dir co
n
figurab
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keepin
g
m
e
r
g
e-recur
s
ive: fix parsing of "dif
f
-al
g
o
r
i
t
hm" op
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John
Ke
e
ping
reset: hand
l
e subm
o
du
l
e with tr
a
i
ling sl
a
s
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
o
h
n
K
e
eping
r
m
: re-use
p
arse_pathspec's trailing
-
slash
removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John K
e
eping
git_remote_helpers:
remove lit
t
l
e
u
s
ed Python
l
ibrary
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-par
s
e(1): lo
g
ically group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
re
v
-parse: remove rest
r
ict
i
ons
on
s
o
m
e
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pull: change the description to
"integra
t
e" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
ohn Keeping
p
u
s
h
: avoid suggesting "mer
g
ing" remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
K
e
e
ping
g
i
t-config(1
)
: clari
f
y pre
c
edence
of
mult
i
p
l
e value
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
Joh
n
Keeping
g
i
t-config:
update do
c
f
o
r
--get with mult
i
ple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
o
h
n Keeping
comp
l
etion: learn ab
o
ut
--man
-
path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Jo
h
n
K
e
epi
n
g
completion: handl
e
unstuck form of base git option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-import: a
l
l
ow
movin
g
the roo
t
tre
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Kee
p
ing
f
a
st-im
p
ort: a
l
low ls or filecopy of the roo
t
tr
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-import: set valid
mode on ro
o
t tree in "l
s
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Kee
p
ing
t9300:
d
oc
u
ment fa
s
t-impo
r
t empty
p
ath issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
subm
o
dule: drop the top-
l
evel re
q
uirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn
Keepin
g
r
e
v-parse:
a
d
d --prefix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
e
e
ping
s
u
bmodu
l
e: show
full p
a
th in error message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n Keeping
t740
3
: add mi
s
sing &&
c
haining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
t7403:
mod
e
r
nize st
y
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7401
:
ma
k
e indentati
o
n
c
onsisten
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keeping
mergeto
o
l--lib: refact
o
r {
d
iff
,
merge}_cmd l
o
gic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
Documen
t
ation/Makefile: m
o
ve
in
f
o
d
ir to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn
K
e
eping
Do
c
umentation/Makefile: fix s
p
a
c
es a
r
oun
d
assignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
add--in
t
e
ra
c
tive: re
s
p
ect diff
.
algo
r
it
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keeping
git-gui: f
i
x file n
a
me han
d
l
ing with non-e
m
pty
p
refix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
fetch: don't try to update unfe
t
ched tr
a
cking
r
efs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
J
ohn Keeping
difftool
:
fix di
r
-diff when file does not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
J
o
h
n
Keepi
n
g
merge-tree: handle directory
/
empty co
n
flict cor
r
ectl
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John K
e
e
p
ing
t/Make
f
i
l
e: don't define TEST_RES
U
LTS_DIRE
C
TORY recur
s
ively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
contrib/subt
r
ee:
d
on'
t
d
e
lete remo
t
e branches if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John
K
eep
i
ng
test outpu
t
:
r
esp
e
ct $TEST_OUTPUT_DIRECT
O
RY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keepi
n
g
t/Makef
i
le: r
e
move s
m
oke test ta
r
ge
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
ohn Keeping
me
r
g
e
-tree: fix typo
i
n "both
c
hanged identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
Joh
n
Kee
p
ing
t/M
a
kefile:
fix result ha
n
d
l
ing with T
E
ST
_
OUTP
U
T_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keeping
transpor
t
-helper:
a
dd 'signed-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transp
o
rt-helper: pass -
-
signed-tags=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keepi
n
g
fast-exp
o
rt: add
-
-signed-tags=warn-s
t
rip
m
ode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Ke
e
ping
t/te
s
t-lib
.
s
h: f
i
x TR
A
SH_
D
I
RECTORY handl
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-tree: don't print entries that
match "l
o
cal"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
J
o
hn Keeping
g
i
tr
e
mote
-
help
e
rs(1): cl
a
r
i
fy refspec behavi
o
ur
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
subm
o
dule: print grap
h
o
u
t
put n
e
xt to
submodul
e
log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keep
i
n
g
diff: allow unstuck
a
rgument
s
with --diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n Keeping
git-mer
g
e(1): d
o
cument diff-al
g
or
i
thm opt
i
on to
m
erge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Kee
p
i
ng
bi
s
e
c
t
:
avoid
signed integer overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
K
eeping
di
f
fcore-break: don't
d
ivide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: run --dir-diff test
s
with a
n
d without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keeping
t7800: fix
tests
w
hen
d
ifftool uses
--no-syml
i
nks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keeping
t780
0
:
d
on
'
t hide gre
p
out
p
ut
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
difftool:
d
on't overwrite mo
d
ified
files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Keeping
t7800: move '--symlinks' specific test
t
o
t
h
e end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
merge-tree:
f
i
x
t
ypo i
n
merge-tree
.
c
:
:unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keepi
n
g
refs
.
c: fi
x
fread error
h
andli
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entry: fix filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Keeping
t2003: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
e
ping
difft
o
ol
--di
r
-diff: sy
m
link
a
ll file
s
matchi
n
g
t
he
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
p
i
ng
difft
o
o
l
:
avoid d
o
uble
sla
s
hes in
s
ymli
n
k t
a
rgets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git
-
dif
f
tool(1): fix formatting of --symlink
d
escrip
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keepin
g
Revert
"gra
p
h
.
c: mark private f
i
le-sc
o
pe
s
ymbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John
K
eep
i
ng
Make
f
il
e
: make ma
n
dir, htmldi
r
a
n
d i
n
fodir absol
u
te
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
K
e
ep
i
n
g
rebase -i: respect core
.
c
ommen
t
char
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
combin
e
-diff
.
c: teach c
o
m
bined
d
iffs ab
o
u
t
li
n
e
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
di
f
f
.
c: u
s
e dif
f
_line_prefix() wh
e
re a
p
plicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
diff: add diff_line_prefix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: make c
o
nstan
t
string
argum
e
nts const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
:
wri
t
e prefix to the c
o
rrect fil
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keep
i
ng
graph: output
p
addin
g
fo
r
merge
subsequent
pare
n
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John
Ke
e
p
in
g
t4038:
a
d
d
t
ests for "diff -
-
cc --r
a
w
<tr
e
es>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
bu
i
ltin/apply: tighten
(dis)similarity
i
ndex
p
arsin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
ohn Keep
i
n
g
merg
e
tool--lib: li
s
t u
s
er co
n
figured tools in '-
-
tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
o
hn Keeping
Rena
m
e {g
i
t
- => git}remote
-
helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
o
hn Kee
p
in
g
C
o
din
g
Guidelines:
a
dd Python coding gui
d
elines
commit
|
commitdiff
|
tree
2013-01-28
Jo
h
n
K
eeping
g
i
t
-remote-test
p
y: fix path hashing o
n
P
y
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keep
i
ng
merge
t
ool
-
-lib: don'
t
c
all "exit"
i
n
setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git-difftool:
u
se git-me
r
getool-
-
li
b
f
or
"
--tool
-
help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git-
m
ergetool: d
o
n't hardcode 'mergetool' in show_to
o
l
_hel
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergeto
o
l: re
m
ove
r
e
d
u
ndant assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Kee
p
ing
git-mergeto
o
l: m
o
ve show_to
o
l
_
help to me
r
getool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote-
t
estpy: call pri
n
t as
a funct
i
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn K
e
eping
git-remote-testpy: don't do
u
nbuf
f
e
red text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next