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 draft release notes to 1.9.2
2014-03-11
John
Keepi
n
g
builtin/mv:
f
i
x
out
o
f bo
u
nds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John Ke
e
p
ing
Make
f
i
le: remove redundant
object in git-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
J
ohn Keeping
pu
l
l
:
s
uppr
e
ss error
w
hen no
r
e
moteref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Kee
p
in
g
comp
l
etion: handle --[no-
]
fo
r
k-point options to
gi
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
o
h
n
Keepi
n
g
co
m
ple
t
i
o
n: complet
e
me
r
g
e-ba
s
e opt
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
Joh
n
K
e
eping
r
e
b
as
e
: f
i
x for
k
-point with
z
ero arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
rebase: use reflog
t
o find common base
with upstr
e
am
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
Joh
n
Keeping
pull: u
s
e merge-bas
e
--
f
ork-point wh
e
n
appropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
h
n
K
e
eping
pe
e
k-r
e
m
ote: remove
d
eprecated a
l
i
as
of ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Jo
h
n Keeping
los
t
-found:
r
emove deprecated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John K
e
epi
n
g
tar-t
r
ee: remove d
e
precated co
m
mand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Ke
e
pin
g
r
e
po-c
o
nfig: remove deprecated alias for
"
git
conf
i
g"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
Documentation/Makefile: make A
s
ciiD
o
c dblatex dir configu
r
a
ble
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
Joh
n
K
e
eping
merge-recursive: fix pa
r
si
n
g of "diff-algorithm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rese
t
:
h
a
ndle submodule with trail
i
n
g
s
l
ash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Ke
e
ping
rm: re-use
p
arse_
p
athsp
e
c
'
s trailing-slash r
e
mov
a
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Keeping
git_rem
o
te_help
e
rs:
r
emove little u
s
ed Python library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev
-
parse
(
1): logically g
r
o
u
p option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
Jo
h
n K
e
eping
rev-parse: remove
rest
r
i
c
tions on some option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
Joh
n
K
e
eping
pu
l
l: change the description to "
i
ntegrate"
changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
o
hn Keeping
push: avo
i
d su
g
g
esting "me
r
ging" remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keepin
g
git-co
n
f
i
g
(1): clari
f
y precedence of multiple
v
alues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John
Keeping
gi
t
-config: update d
o
c fo
r
--get with mu
l
tiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
completion: learn about --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
completion
:
ha
n
dle unstuck form o
f
base g
i
t o
p
tio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John K
e
eping
fast-import: allow movi
n
g
the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Joh
n
Ke
e
ping
fast-impor
t
: all
o
w ls or file
c
opy of the r
o
ot tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Keep
i
n
g
fast-import: se
t
valid mode on root
tree
i
n
"
l
s
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t9300: docu
m
ent fast-import empty path
i
ssues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule:
d
r
op the top-level requiremen
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keep
i
n
g
rev-p
a
rse: add
-
-p
r
efix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n
Keeping
s
u
bmodule: show full path in er
r
or mes
s
age
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403: add missing && chain
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t
74
0
3: mo
d
ernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7
4
01: mak
e
inden
t
atio
n
consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepin
g
mergetool
-
-lib: refactor
{
diff,merge}
_
cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
Doc
u
mentation/Makefile: mo
v
e
infodir
t
o be w
i
th other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepin
g
Documentation/Makefile: fix spaces around
a
s
signments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
add--interactive: respec
t
diff
.
algorit
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
J
ohn Keeping
git-gui: f
i
x file
name handlin
g
wi
t
h non
-
em
p
ty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keep
i
n
g
fe
t
ch:
don't try to update unfetche
d
tr
a
ck
i
ng refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keepi
n
g
difftool:
f
ix
dir
-
diff when
fi
l
e does not exist i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
J
o
h
n
K
eeping
m
e
rge-tree
:
handle directory
/
e
mpty conflic
t
cor
r
e
ctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t
/Make
f
ile: don'
t
define TE
S
T_RESULTS_D
I
RECTORY
recursivel
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
J
ohn Keeping
contrib/su
b
tree:
don't d
e
lete r
e
mote b
r
anches if
s
p
lit
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John
K
eep
i
ng
test
output
:
re
s
pe
c
t $TEST_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn
K
e
e
ping
t/Make
f
i
le: rem
o
ve sm
o
k
e t
e
st
t
argets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merge-tr
e
e
:
fi
x
typo in "both changed i
d
e
nti
c
a
l
ly
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t/Makefile:
fix
result
handling with TEST_OUT
P
UT_DIRECTOR
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n K
e
eping
transport-helper:
a
d
d
'si
g
ned-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
ping
transpor
t
-helper: pass --signe
d
-tags=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Keeping
fast-ex
p
ort:
a
dd --si
g
n
e
d-tags=warn
-
s
t
rip
mod
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/test-lib
.
sh: fix T
R
AS
H
_
D
IR
E
CTO
R
Y handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
me
r
ge-
t
re
e
: don't print entries that
match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Ke
e
ping
gitremote-helpers(1): cl
a
rify re
f
s
pec be
h
av
i
o
u
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keep
i
n
g
submodul
e
: print graph output nex
t
to submo
d
ule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eepi
n
g
diff: allow uns
t
uck a
r
g
u
m
e
n
t
s with --diff-a
l
g
o
rith
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
Keeping
git-merge(
1
): docum
e
n
t
diff-
a
lgorithm option to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Jo
h
n
Keeping
bise
c
t: av
o
id signe
d
in
t
eger overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
diffcore-br
e
ak:
don't divide
b
y zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eeping
t7800: run -
-
d
i
r-
d
iff tests with an
d
w
i
t
hou
t
symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n
Kee
p
ing
t
7800: fix t
e
sts when difftool uses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
ing
t
7800:
d
o
n't hide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
difftool: don't o
v
erwrite modifi
e
d
fi
l
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: move '-
-
symlinks' spec
i
fic
t
est
t
o t
h
e
en
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
o
hn Ke
e
p
i
ng
merge
-
tree: fix typo in mer
g
e-tree
.
c::unresol
v
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keep
i
ng
re
f
s
.
c: fix f
r
ead error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n
K
eeping
e
ntr
y
:
fix f
i
lter lo
o
kup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2
0
0
3: mo
d
ernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
e
eping
difftool
-
-dir
-
diff:
s
ym
l
ink all
f
iles matching
the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
d
iff
t
ool: avoid
d
ouble
s
lashes in symlink tar
g
ets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-d
i
fftool(1)
:
fix formatt
i
ng of
-
-s
y
mlink descripti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Revert
"graph
.
c
:
m
ark
p
rivate fil
e
-scope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John K
e
ep
i
ng
M
a
kefile:
make ma
n
dir, htm
l
dir
a
n
d i
n
fodir abso
l
u
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
r
e
ba
s
e -i: res
p
ect
cor
e
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
combine-diff
.
c: teach c
o
m
bined di
f
f
s
about l
i
ne
p
re
f
ix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n
K
eeping
dif
f
.
c
: use diff_
l
ine_prefix() whe
r
e applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
dif
f
:
add dif
f
_li
n
e_prefix functi
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
e
e
ping
d
i
f
f
.
c: make constant s
t
ring ar
g
u
ments
c
onst
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Ke
e
ping
di
f
f: wri
t
e p
r
ef
i
x to the corre
c
t file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
Joh
n
Keepi
n
g
graph: outp
u
t
p
a
d
di
n
g for
merge s
u
bseq
u
e
n
t p
a
rent
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t4038: add
t
est
s
for "
d
iff --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
ping
builtin/apply: tigh
t
en
(d
i
s)similarity index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keepin
g
mer
g
etool--lib: l
i
st
u
ser con
f
igur
e
d tools in
'--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
o
hn Keepi
n
g
Rename {git
-
=> git}rem
o
te-helpe
r
s
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
Jo
h
n
K
ee
p
ing
C
oding
G
uidelines: add Pyth
o
n coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-remote-testpy: fix path has
h
in
g
on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John
Keeping
merg
e
t
ool--lib: don't call "
e
x
i
t
" i
n
setup_
t
ool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
g
it-difftool: use g
i
t-merget
o
ol
-
-lib for "
-
-t
o
ol-
h
elp"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eep
i
ng
git-mergetool
:
d
o
n
't har
d
code 'merget
o
ol'
in
sho
w
_too
l
_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git-
m
erg
e
tool: remove redundant assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
g
i
t-mergetoo
l
: move show_tool
_
help to
m
ergetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n
Keeping
git-remote-test
p
y: c
a
ll print as a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git-remote-
t
estpy:
do
n
't do
u
nb
u
ffer
e
d text I
/
O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keepi
n
g
git-remote-testpy: hash bytes explicitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Kee
p
ing
sv
n
-fe
:
a
llow svnr
d
ump_sim
.
py
t
o
run with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n
K
eeping
git_remote_helpers: u
s
e 2to3 if building wi
t
h Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_r
e
mo
t
e
_h
e
lper
s
: force
r
ebuild if pyt
h
on version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John K
e
eping
git-cvsimpo
r
t
.
txt: c
v
s
p
s-2 is deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
Joh
n
Keeping
git-for-each-ref
.
tx
t
: 'raw' is a sup
p
ort
e
d
d
ate f
o
rmat
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next