repo.or.cz
/
git.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 for 1.8.4
2013-07-08
John Keeping
pull: change the description to
"integrate" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Jo
h
n
K
eeping
push: a
v
oid
suggesti
n
g "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 pre
c
edenc
e
of mul
t
iple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Ke
e
p
i
n
g
git-confi
g
: upda
t
e doc for --get
w
i
t
h multip
l
e
val
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
com
p
letion: lear
n
abou
t
--man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
completion: handle unstuck fo
r
m of b
a
se git options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
su
b
module: d
r
op the top
-
level
requireme
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n
Keeping
rev-pars
e
: a
d
d --pr
e
fix opt
i
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keeping
submodul
e
:
s
how f
u
ll p
a
th in error m
e
ssag
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
t740
3
: add
m
i
ssing
&
& chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keepi
n
g
t7403:
m
od
e
r
n
ize s
t
y
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keeping
t7401: make inden
t
ati
o
n consis
t
ent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Kee
p
ing
merg
e
tool--l
i
b: refactor {dif
f
,merge}_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
ng
Documentation/Makefile:
move infodir to be
w
ith other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
D
o
c
u
m
e
ntation/Makefile: fix s
p
a
ces ar
o
u
nd assignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
a
d
d--inte
r
active: respect diff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
Joh
n
Keeping
g
i
t-gui:
f
ix file name handling
with non-empty
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
fetch: don't try to up
d
ate unfetched tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John
Keepi
n
g
difftool: fix dir-diff when file does not exist
i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
Jo
h
n Keeping
merge-
t
ree:
h
andle
d
irectory/empt
y
conflict corre
c
tly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
J
o
h
n
Keep
i
n
g
t/Mak
e
fil
e
:
don't
define
TEST_RESU
L
TS_DIRECTORY r
e
cursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John
K
eeping
contrib/subtree: don't delete remot
e
branches if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
t
e
st output: resp
e
ct $TEST_OUTPUT
_
DIREC
T
OR
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn
Keeping
t/M
a
kefile: remove s
m
o
ke te
s
t targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John
K
e
epi
n
g
merge-tree
:
fix typo i
n
"b
o
t
h
cha
n
ged
identic
a
lly"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keepin
g
t/Mak
e
file: fix resu
l
t
h
andling with
T
EST_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Ke
e
p
ing
transp
o
rt-h
e
lper:
a
d
d
'
s
igned-tags' capa
b
ility
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
r
an
s
port-helper: pa
s
s --signe
d
-tag
s
=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
ping
f
a
st-ex
p
ort: add
-
-signed-tags=warn-strip mod
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eepi
n
g
t/te
s
t-
l
ib
.
s
h: fix TRASH_
D
I
R
E
CT
O
RY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-
t
ree: don't pri
n
t entries that
match "loca
l
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
git
r
emo
t
e-helpers(1): clarify refsp
e
c behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eeping
submodule: pri
n
t graph output n
e
xt
t
o s
u
bmodule
log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n
Keepi
n
g
d
iff: allow unstuck arguments
with
--diff-al
g
o
rithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
git-merge(1): document d
i
ff-algorithm option to me
r
ge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Jo
h
n Keeping
bisect: avoid sign
e
d
integer overfl
o
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
Keeping
diffcore-break:
d
on't
d
iv
i
de
b
y ze
r
o
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t
7800: run --dir-diff tests with and without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keep
i
ng
t7800: fix tests when d
i
fftoo
l
uses
-
-no-s
y
mlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
oh
n
K
eeping
t7800: don't hide gr
e
p ou
t
p
u
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
dif
f
tool: don't ov
e
r
write modi
f
ied files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: move '--
s
ymlinks' sp
e
cific test to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John
Keep
i
ng
merge-tree: fix
t
ypo i
n
merge
-
tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c: fi
x
fread error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
entry
:
f
ix filte
r
loo
k
up
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2003: moderniz
e
sty
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool --dir-
d
iff:
symlink
a
ll files matching
the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
diff
t
ool
:
avoid doubl
e
s
lashes in
s
y
ml
i
n
k
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): fi
x
formatting of
-
-
s
y
m
l
ink descrip
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
J
ohn Keeping
Revert
"graph
.
c: mark p
r
ivate file-scope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Ke
e
ping
Ma
k
e
fi
l
e: ma
k
e mandir, htmldir a
n
d
i
n
fodir a
b
so
l
ute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
rebase
-
i
:
respect c
o
re
.
c
ommentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
co
m
bine-d
i
ff
.
c
: teach combined di
f
fs
a
bout
line pr
e
fix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
diff
.
c
:
use diff_line_prefix(
)
whe
r
e
a
pplic
a
bl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: add di
f
f_line_prefi
x
function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
dif
f
.
c:
make
constant stri
n
g arguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
d
i
ff: write
prefix t
o
t
he co
r
rect fi
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
ohn Keeping
graph: ou
t
pu
t
p
a
dding for merge subsequent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t40
3
8
: add tests for
"diff
-
-cc --raw <
t
rees
>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Joh
n
K
eeping
bu
i
ltin/app
l
y: tight
e
n (dis)s
i
milarity inde
x
par
s
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keepi
n
g
mergetool--lib: list
us
e
r configu
r
ed
too
l
s in
'
--too
l
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Rename {
g
it- => git}
r
e
m
ote-
h
e
lpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
CodingGuidelines: add Pyth
o
n c
o
di
n
g guid
e
lines
commit
|
commitdiff
|
tree
2013-01-28
John K
e
eping
git-remote
-
testpy:
f
ix path hashing on Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
merget
o
o
l
--lib
:
don't
c
all "exi
t
" in setu
p
_to
o
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-difftool: use
git-merge
t
oo
l
-
-lib for "-
-
to
o
l-
h
e
l
p"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
-mergetool:
don't hardco
d
e 'mergeto
o
l' in show_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git-me
r
g
etool: remo
v
e redundant a
s
si
g
nment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
git-mergetool:
m
o
ve
s
how_tool_help to m
e
rgetool--l
i
b
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n
K
eeping
git
-
remote-tes
t
py: call p
r
int as a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keepi
n
g
git-re
m
ote-testpy:
do
n
't do unbuffered text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
g
it-remote-t
e
st
p
y: ha
s
h bytes ex
p
licitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn K
e
eping
s
vn-fe: all
o
w svnrdump_sim
.
py to run with Pyt
h
on 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
_remote_helpers: use 2to3
i
f buildi
n
g with Py
t
ho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_remote_helper
s
: force re
b
uild if pytho
n
version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keepin
g
gi
t
-cvsimp
o
rt
.
txt: cvs
p
s-2
is dep
r
ecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keeping
git
-
for-each-ref
.
txt: 'raw' is a supported
d
ate format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keepi
n
g
git_remo
t
e_help
e
rs: fix
input
w
h
en runn
i
ng u
n
der Pyt
h
o
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_remo
t
e_helpers: a
l
l
o
w building wit
h
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keeping
git-svn: teach find-rev t
o
find near m
a
tch
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
g
i
t
-fast-imp
o
rt
(
1):
r
e
orga
n
ise opti
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
o
h
n
Keeping
g
i
t-
f
ast-import(1)
:
c
omb
i
ne docum
e
nt
a
t
ion
of --[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keepi
n
g
gi
t
-
s
h
ortl
o
g(1)
:
document beha
v
iour of zero-
w
idth w
r
ap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keepi
n
g
git-fast-import(1
)
: remo
v
e
d
u
pl
i
c
ate '-
-
done' option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John Ke
e
p
ing
Docu
m
entatio
n
: don'
t
link to example mail addresses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
J
ohn Keepin
g
re
b
ase -i c
o
ntinue
:
don't skip commits that
o
nly c
h
ange
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree