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
completion: handle --[no-]fork-point options to git-rebase
2014-01-13
Jo
h
n Keepin
g
c
ompletion: handl
e
-
-[no-]fork
-
point options to git
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
com
p
letion: complete merge-base
o
p
tion
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-12-10
John Keepin
g
rebase: use
ref
l
o
g to find com
m
o
n
bas
e
with upst
r
e
am
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-12-09
John Ke
e
p
i
ng
p
u
ll: use merge-base --
f
ork-point
w
hen
appropriate
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John Ke
e
p
i
ng
pee
k
-remote:
r
emov
e
deprec
a
ted
al
i
as of ls-re
m
ote
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
los
t
-found: remove de
p
recat
e
d com
m
and
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John K
e
eping
tar-tre
e
: remove
dep
r
ecated command
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
repo-config: remove dep
r
ecate
d
a
lias for "git config"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
Docume
n
tation/Makefi
l
e: m
a
ke As
c
i
i
Doc dblatex dir
configurable
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
merge-recu
r
sive: fix par
s
ing of
"diff-algori
t
hm" option
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-13
J
ohn Keepin
g
re
s
et: ha
n
dle
subm
o
d
ule
with trailing sla
s
h
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-13
J
o
hn Keeping
rm: re-use parse_path
s
pec's traili
n
g-slash removal
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-09
John Keeping
git_remote_help
e
rs: rem
o
ve
lit
t
le used
P
ython libr
a
ry
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-22
Jo
h
n Keep
i
ng
r
ev
-
parse(
1
): logically group
o
pti
o
ns
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-22
Joh
n
Keepi
n
g
r
e
v
-parse: remove restrictions on some opti
o
ns
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-08
John
Keep
i
ng
p
ull: chan
g
e the descri
p
tio
n
to "integrate"
c
hanges
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
push: avoid sugg
e
sting "merging" re
m
ote chan
g
es
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
git-config(
1
): clari
f
y precedence
o
f multiple v
a
lues
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-03
John Keepin
g
git-config: update
doc
for --ge
t
with
multiple values
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-30
J
o
h
n Keeping
c
o
mplet
i
on: learn about --
m
an-p
a
th
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-30
Jo
h
n
K
e
e
p
ing
completion: handle uns
t
uck
f
orm of base git opt
i
ons
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n Keeping
fast-import: allow moving t
h
e roo
t
tree
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John
Keeping
fast-i
m
port
:
allow
l
s or filecop
y
o
f
the
roo
t
tree
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Keeping
fast-
i
mport: set
valid mode o
n
r
o
ot tr
e
e
in "ls"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John Keepin
g
t
9
300: docum
e
nt
f
ast-import
e
mp
t
y path
issu
e
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
s
u
bmo
d
ule: dr
o
p th
e
to
p
-level requirement
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John
K
e
e
pi
n
g
rev-parse: add --p
r
efix optio
n
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
s
ubmodule: show
f
ul
l
path
in error mess
a
ge
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
t
7
403: add missing && chainin
g
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403: mode
r
nize s
t
yle
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keepi
n
g
t7401: mak
e
indentation con
s
iste
n
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
mergetool--
l
i
b
:
r
efact
o
r {diff,merge}_c
m
d
lo
g
ic
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Documentati
o
n/Makefile: move
i
n
fodir
t
o
be
w
ith other
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John
K
e
e
p
ing
D
o
cum
e
nt
a
tion/Makef
i
l
e
: f
i
x
s
p
aces aro
u
nd a
s
signmen
t
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
ad
d
--i
n
t
e
ra
c
tive: r
e
spect diff
.
a
lgorithm
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-07
John Keepi
n
g
git-gui: fix
f
ile name handling
w
ith non-em
p
ty prefi
x
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-28
John Ke
e
pi
n
g
fetch: don't try to
updat
e
unfetched tracking refs
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-17
J
o
h
n Keepin
g
diffto
o
l: fix dir-diff
whe
n
f
il
e
doe
s
not ex
i
st in
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-07
J
ohn Ke
e
ping
merge-tr
e
e
: handle directory/empty conflict
correct
l
y
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/M
a
k
efi
l
e
:
don'
t
define TES
T
_RESULTS_DIRECTORY recursively
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-01
J
ohn Keeping
c
o
n
t
rib/subtree
:
don't
delete remot
e
branc
h
es
if sp
l
it
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-29
J
o
hn Keeping
te
s
t o
u
tput: r
e
sp
e
c
t
$
TEST
_
OUTPUT_DIRECTORY
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn Ke
e
pin
g
t/Makefile: re
m
ove
smok
e
tes
t
targets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merge-t
r
ee: fix typo in "bot
h
changed i
d
entically"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-27
John
K
e
eping
t/Makef
i
le:
fix result hand
l
ing with TEST_OUTPUT_DIRECT
O
RY
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keepin
g
tra
n
sport-helper: a
d
d 'sig
n
ed-tags' c
a
pability
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transp
o
rt-helper:
pass --s
i
gned-t
a
g
s=
w
ar
n
-strip to
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
ng
fast-expo
r
t: add --signed-tags=warn-
s
t
rip mode
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Keeping
t/test-lib
.
s
h: fix TRA
S
H_DIRECTOR
Y
handli
n
g
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
m
e
rge-t
r
ee: don'
t
p
r
i
n
t
e
ntrie
s
th
a
t
match "lo
c
al
"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitremote-helpers(1): clarif
y
refs
p
ec be
h
a
v
i
our
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
J
o
h
n
Keepi
n
g
s
u
bmodule: p
r
int grap
h
output next to sub
m
odule log
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
diff: all
o
w un
s
tuck arguments with
-
-d
i
ff-algo
r
ithm
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
g
i
t-m
e
rg
e
(1
)
: document diff-a
l
g
or
i
th
m
option to merge
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
John
K
eepi
n
g
b
isect: a
v
o
i
d
signed intege
r
overflow
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Keeping
d
i
ffcore-break: don't divide by z
e
r
o
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
J
oh
n
Keepin
g
t78
0
0: run -
-
dir-diff tests with and wit
h
out sy
m
links
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eeping
t7800: fix test
s
when
difftool us
e
s -
-
no
-
symlinks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John
K
ee
p
ing
t7800: don't hi
d
e
g
r
ep output
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keeping
d
ifftool: don't overwrite modified fil
e
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eepi
n
g
t7800:
m
ov
e
'--symlinks' specific te
s
t to the end
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-27
John
Keepin
g
merge-tree:
f
ix t
y
po in
m
erge-tree
.
c::unresolve
d
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c
:
fix fre
a
d
err
o
r hand
l
i
ng
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eep
i
ng
en
t
r
y
: fix f
i
lt
e
r lookup
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn K
e
e
p
i
ng
t
2
003:
m
odernize
s
tyle
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
difftool --dir-diff:
s
y
mlink
all files matching
the
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eeping
difftoo
l
: avoid double
s
lashes in sy
m
lin
k
targets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-difftoo
l
(1)
:
f
ix formatting of -
-
symlink
d
e
scription
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-04
Jo
h
n
K
e
eping
Revert "graph
.
c: mark private fil
e
-scope symbols as
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Makefile
:
make mand
i
r
,
ht
m
l
d
i
r
and infodir absolute
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keep
i
ng
r
e
base -i: respect core
.
commentchar
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
com
b
ine-diff
.
c: te
a
ch
c
o
m
b
ine
d
diff
s
abo
u
t lin
e
p
refix
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
diff
.
c: use diff_line_prefix() whe
r
e a
p
pli
c
able
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
diff: add diff_line_prefix fu
n
c
t
ion
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: make constant string arguments const
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
i
n
g
d
iff: write pre
f
i
x
to the correc
t
f
i
le
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
gra
p
h: out
p
ut padding for m
e
rg
e
subse
q
uent parent
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-05
John
Keep
i
ng
t4038: add tests
f
or "diff --
c
c --raw <trees>"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John Keep
i
ng
builtin/apply: tighten (dis)si
m
ilarity index parsing
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John Keepin
g
me
r
getool--lib: lis
t
us
e
r conf
i
gured
to
o
ls
i
n
'
--tool
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-01
J
o
hn
Keepi
n
g
Ren
a
me
{
gi
t
- => git}remote-helpers
.
t
x
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-30
John Ke
e
ping
CodingGuidelines:
add Pytho
n
coding g
u
idelines
commit
|
commitdiff
|
tree
2013-01-28
Jo
h
n Keep
i
ng
git
-
remote-testpy: fix pat
h
h
a
shing on
Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-28
John Ke
e
ping
merget
o
ol--lib
:
d
o
n
't call "exit" i
n
setup_to
o
l
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-di
f
ftool: use gi
t
-me
r
get
o
ol--lib fo
r
"-
-
t
ool-help"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n Keeping
g
i
t-mergetool: don't h
a
rdcode '
m
erge
t
oo
l
'
i
n
show_tool_
h
e
l
p
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
e
p
ing
git-merg
e
too
l
: remove redundant assignment
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-m
e
r
getool: move sh
o
w_
t
ool_he
l
p to merge
t
ool--lib
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
it-remote-testpy: call
print as a fun
c
tion
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git-remote-testpy: don't d
o
unbuffered text
I
/O
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn
K
eeping
git-remo
t
e-testp
y
: hash bytes expl
i
citly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
e
p
ing
sv
n
-fe: a
l
low svn
r
d
ump_sim
.
py to run with Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
g
i
t
_r
e
mote_helpers: use 2to3
i
f
building wit
h
P
y
tho
n
3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
g
i
t_remote_helpers: for
c
e rebu
i
l
d
i
f pytho
n
version
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-24
John Keeping
git-cvsimport
.
txt: cvsps
-
2 is deprecated
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-22
J
o
hn
Keeping
git-for-each-ref
.
txt
:
'raw' is a supp
o
rted date format
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-21
Jo
h
n Keeping
git_
r
emote_hel
p
er
s
: fix input when running
under Py
t
h
on
3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-21
J
ohn Keeping
git_remote_helpers: allo
w
bui
l
ding with
P
yth
o
n 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-17
John Keeping
g
it-s
v
n: t
e
ach fin
d
-rev to find near matc
h
es
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fast-import
(
1
)
: re
o
r
ganise options
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
next