repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
get_octopus_merge_bases(): cleanup redundant variable
2013-12-10
Joh
n
Keepi
n
g
rebase: use re
f
log to find
c
o
m
mon base with upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
Joh
n
K
e
e
p
ing
pull: u
s
e m
e
rge
-
b
a
se
-
-for
k
-point when appro
p
r
ia
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
h
n
K
e
e
ping
peek-remote: remove deprecated
a
lias of ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John K
e
epin
g
lost-f
o
und
:
remove deprec
a
t
e
d com
m
an
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keep
i
ng
tar-tree: re
m
ov
e
depre
c
a
t
ed command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
Keeping
r
epo-conf
i
g
:
r
emove de
p
re
c
ated alias for
"
g
it confi
g
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Kee
p
ing
Docu
m
entation/Ma
k
efile
:
mak
e
A
sci
i
Doc d
b
latex dir
configurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
m
erge-r
e
cursive:
f
i
x
parsing of "diff-algor
i
thm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
reset: handle sub
m
odul
e
with
t
r
a
iling slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John
K
eep
i
ng
rm: re-use
p
arse_pathspec'
s
t
r
ailing-sla
s
h
removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Keepin
g
git_
r
emote_helpers: remove li
t
tle used Python library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Ke
e
ping
rev-parse(1)
:
l
ogical
l
y
group o
p
tions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John
K
ee
p
ing
rev-parse:
remove restrictions on some options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pull:
c
hange the
d
escription to
"
inte
g
r
a
te" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
o
hn
Keeping
p
ush:
a
void suggesting "merging" remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Jo
h
n
Keeping
git-config(1): clarif
y
prece
d
ence of multiple value
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
Joh
n
Keeping
git-config: update do
c
for --get w
i
th mult
i
p
le values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Kee
p
ing
comp
l
etion: learn about --man-
p
ath
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keep
i
ng
completion: handle unstu
c
k form
o
f
base git options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
h
n Keepi
n
g
f
a
st-impo
r
t: allow moving 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: allow l
s
or filecopy
o
f
the ro
o
t tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
eeping
fast-imp
o
rt:
set
valid mode o
n
root tree in
"
ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
eep
i
ng
t9300:
d
o
c
ument fas
t
-import empty path iss
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
subm
o
dule: drop the top-level requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
re
v
-p
a
rse: add
-
-
pref
i
x op
t
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
subm
o
dul
e
: s
h
ow full path
i
n error
me
s
sage
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
epi
n
g
t7403:
a
dd missing && chain
i
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t740
3
:
mo
d
e
rniz
e
st
y
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
t7
4
01:
m
ak
e
indentation co
n
sistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
mergetoo
l
--lib: refactor {diff,
m
erge}_cmd log
i
c
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
in
g
Documentation/Makefile: move infodir to be
w
ith other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
Documentation/M
a
kefile
:
fix
s
p
aces arou
n
d as
s
i
g
nments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Kee
p
ing
a
d
d--inter
a
ct
i
ve: res
p
e
c
t diff
.
algorit
h
m
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
file name hand
l
i
n
g with
n
on-empty p
r
efix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
fetch: don't try to update unfetched tracking
refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John
Keeping
difftool: fix dir-diff w
h
en file
d
oes not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
J
o
h
n
K
eeping
mer
g
e-tree: handl
e
director
y
/empty conflict c
o
rrectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John
Keeping
t
/
M
a
kefile: don't define TEST_R
E
SULTS_DI
R
E
CTO
R
Y recur
s
i
v
ely
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
c
o
ntrib/s
u
btree: don't de
l
et
e
remo
t
e branche
s
if s
p
lit
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test out
p
ut: respect $TEST
_
OU
T
PUT_DI
R
E
C
TORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn Keepin
g
t
/
Makefile:
remove smoke test
t
argets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John K
e
eping
merge-t
r
e
e: fix ty
p
o in
"
both changed identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keepin
g
t/Ma
k
efile: fix result handling with TEST_OU
T
PUT_D
I
RECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
ing
tr
a
nsport-he
l
p
er: add 's
i
gne
d
-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
ng
tr
a
nsp
o
rt-helper:
pass --sig
n
ed-tags=
w
arn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-export: add
-
-s
i
gned
-
tags=warn-st
r
ip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
ing
t
/test-l
i
b
.
sh: fix
T
RASH_DIRECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keepin
g
merge-tree: don
'
t p
r
int ent
r
i
e
s
t
h
at match "
l
ocal"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keepin
g
gitremote-
h
elpers(1): clarify refspec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n Keeping
sub
m
odule: pri
n
t graph output n
e
xt
t
o
s
ubmod
u
le
log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keepin
g
diff: a
l
low unstuck ar
g
u
m
ents with --diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
oh
n
Ke
e
ping
git-merge(1): document d
i
ff-
a
lgor
i
thm o
p
tion t
o
merg
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
Keeping
bisect: avoid signed integer overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn Keeping
diff
c
ore-b
r
ea
k
: don'
t
d
ivide by
z
ero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800:
r
un --dir-diff t
e
sts with and wi
t
hout symli
n
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t7800:
f
ix test
s
wh
e
n difftool uses --no-symlink
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eeping
t7800: d
o
n't
h
ide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepin
g
difftool: don't
o
v
e
rwrite modifi
e
d files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: move '--symlinks' specif
i
c test to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keepin
g
merge-
t
re
e
: fix typo in merge-tree
.
c
:
:unresolve
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
r
e
f
s
.
c:
f
ix fr
e
ad error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
ping
entry: fix f
i
l
ter
l
o
okup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t
2003
:
m
o
dernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keep
i
ng
difftool
-
-dir-
d
iff: symlink a
l
l files matchi
n
g
the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
diff
t
ool: avoi
d
double slashes in symlink tar
g
e
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
gi
t
-d
i
f
f
t
oo
l
(1): f
i
x for
m
atting o
f
--symlink de
s
cri
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Kee
p
i
ng
Revert "gra
p
h
.
c: mark private file-scope s
y
mbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keepi
n
g
Ma
k
efile: make
m
andir, htm
l
d
i
r
and info
d
ir a
b
so
l
ute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
n
g
r
eb
a
se
-
i:
respe
c
t cor
e
.
c
o
m
me
n
tchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
combine-diff
.
c: tea
c
h
co
m
bine
d
diffs about line
pre
f
ix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
dif
f
.
c:
u
se diff_line
_
prefi
x
() wh
e
r
e a
p
plic
a
ble
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
e
e
ping
dif
f
:
add diff_line_pr
e
fix
f
unction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
ee
p
ing
diff
.
c: mak
e
con
s
tant
s
t
r
ing argumen
t
s
const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
diff: write
prefix
to the correc
t
file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John
Keep
i
n
g
graph: output
pa
d
ding
for
merge
s
ubsequent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John K
e
e
ping
t
4038: add tests for "diff --cc --raw
<trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
hn Keeping
bu
i
l
tin/apply: tighten (dis)similarity inde
x
parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
mergetool--lib: l
i
st user configure
d
tools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
R
ename {git- =
>
g
i
t}remote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
Co
d
ingGuidelines: add
Python coding
g
uidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keepin
g
git-remote-testpy: fix
path
h
ashing on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Ke
e
p
i
n
g
m
ergetool--
l
ib: don't call "exit
"
in se
t
up_t
o
ol
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
g
it-difftoo
l
:
use git-mergetool--lib
for "--tool-h
e
lp"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergetool:
don't
h
ardcode '
m
ergetool' in show
_
tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-me
r
g
e
tool: remove redun
d
a
n
t ass
i
gnment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git-mergetool: move sh
o
w_tool_help to mergetool
-
-lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-remote-testpy: call print
a
s a fu
n
ction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git-remote-testpy:
don't do unb
u
ffe
r
ed text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-re
m
ote-t
e
s
t
py: hash bytes explicitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
e
ping
s
vn-fe: al
l
ow svnrdum
p
_sim
.
p
y to
run with Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_remote_h
e
l
pers: use
2
to3 if b
u
i
l
ding with
P
yth
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
git_re
m
o
te_helpe
r
s: force reb
u
il
d
if pytho
n
version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
Jo
h
n Keep
i
ng
git-cvsimport
.
txt: cvsps-2 is deprecate
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keep
i
n
g
git-for-ea
c
h-
r
e
f
.
tx
t
: 'raw' i
s
a support
e
d
d
ate format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
o
h
n Keeping
git_remote_he
l
p
ers: fix input when running under Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John K
e
ep
i
ng
git_re
m
ote_help
e
r
s: all
o
w building with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keeping
git
-
svn: teach f
i
n
d-rev to find ne
a
r matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Kee
p
i
ng
g
it-fas
t
-import(1
)
:
r
eorg
a
nise options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fa
s
t-i
m
p
o
rt(1): com
b
ine do
c
u
me
n
tation of
-
-[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git
-
s
h
ortl
o
g
(1):
document
b
e
havi
o
ur of zero-wi
d
th wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next