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
John Ke
e
ping
completion: h
a
n
d
le
-
-[no-]fo
r
k-point options to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
o
hn Keeping
c
omplet
i
on: comple
t
e
m
erge-
b
ase optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
J
ohn Keeping
re
b
ase: u
s
e re
f
log to find common
base with
u
pstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John
K
eepi
n
g
pull: use merge-b
a
se --fork-point when appropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Joh
n
K
eeping
peek-rem
o
te: remove deprecated
a
lias of ls-r
e
mote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Ke
e
ping
lost-found:
r
emove deprecated comma
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
tar-
t
ree: r
e
move
d
e
precated
c
o
m
m
and
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
Kee
p
in
g
repo
-
c
o
nfi
g
: remove
d
eprecated ali
a
s
f
or
"
git con
f
ig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
D
o
c
umentation/Makefile
:
make
AsciiDoc dbla
t
ex dir c
o
nf
i
g
urable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
Joh
n
K
eeping
merge-recursive
:
f
ix parsing of "diff-algo
r
ithm" optio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
reset
:
han
d
le submodule with trailing slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keepi
n
g
rm: re-use parse_p
a
t
h
s
p
ec
'
s traili
n
g
-slash re
m
oval
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Keeping
git_remote_h
e
l
pers: remove
l
it
t
le used Python library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev
-
parse(1): l
o
gically
g
rou
p
o
p
tions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John
K
eepi
n
g
rev-
p
a
r
se:
remove
r
estrictions
on
s
ome options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John
Keeping
p
ull: change the
d
esc
r
iption to "integrate" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
push: avoid suggesting "mergin
g
" r
e
m
o
te changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keep
i
ng
g
i
t-config(1):
c
larify p
r
ecedenc
e
of
multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keep
i
ng
git-con
f
ig: up
d
ate doc f
o
r -
-
get wi
t
h mu
l
tipl
e
values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John
K
eeping
completion: learn about
-
-man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
o
hn Keeping
com
p
letio
n
:
h
andle unstuck form of ba
s
e gi
t
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn
Keepi
n
g
fa
s
t
-
imp
o
rt: allow moving the roo
t
tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John K
e
eping
fast-impo
r
t: allow ls or filecopy of the roo
t
t
ree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n
Keeping
fast-import: set valid mod
e
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:
document fast
-
im
p
ort empty path
issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn
Keeping
su
b
module: drop the top-level r
e
qu
i
rement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
e
p
ing
rev-parse: add --pre
f
ix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keepi
n
g
submodule: show ful
l
path in
error message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
t7403: add missing &&
chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
t7
4
03: moderni
z
e style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t
7401: m
a
ke inden
t
at
i
on consist
e
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
mergetool--lib: refactor {diff,merge
}
_
c
md
l
ogic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
D
o
c
u
m
e
ntation/Mak
e
file: move infodir
t
o
be with oth
e
r
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keeping
Docu
m
entation/Makefi
l
e: fix s
p
aces around assi
g
nments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
Joh
n
Keep
i
n
g
ad
d
-
-
inter
a
ctive: respect diff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
J
o
h
n
K
eeping
git-
g
u
i
: f
i
x file name handl
i
ng w
i
t
h
non-empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
fetch
:
do
n
't try to
u
pdate unfe
t
ched tra
c
king
refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
Joh
n
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
John K
e
e
ping
me
r
ge-tre
e
: handl
e
d
i
rectory/empty conf
l
ict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/Makefile: don't
d
efine TE
S
T
_
RESUL
T
S
_
DIRECTORY r
e
cursi
v
ely
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
Jo
h
n Keepin
g
contrib/subtree:
d
on't d
e
let
e
r
e
mote branches if sp
l
it
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Ke
e
ping
test output:
r
espect
$T
E
S
T
_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John K
e
ep
i
ng
t/Makefile: remove smok
e
test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Jo
h
n
Keeping
merge-tre
e
: fix typo in "both changed
i
dentically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
Jo
h
n Keeping
t/Makefil
e
: fix res
u
l
t
handli
n
g with TES
T
_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Keeping
transpo
r
t-helper: add
'
signed-t
a
gs' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transport-h
e
lper: pas
s
--signe
d
-
tags=warn-strip t
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-export: add --signed-tags=warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keeping
t/test-lib
.
sh:
f
ix
T
RASH_DIRECTORY
h
andli
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
Jo
h
n
Kee
p
ing
merge-tree:
don
'
t
p
r
int
e
ntries that
m
a
t
ch "
l
ocal"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
J
ohn Keeping
g
itremote-helpers(1): clarify refsp
e
c
behavi
o
ur
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn
Keeping
submodule: print gr
a
ph o
u
tput next to submod
u
le log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keepi
n
g
diff: allow unstuck arguments with --
d
iff-algorit
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n Keeping
git-merge(1): do
c
ument d
i
ff-algorithm option to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Keeping
bisect: a
v
oid signed int
e
ger over
f
low
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keepi
n
g
diffcor
e
-
break
:
d
on't div
i
d
e
by ze
r
o
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepi
n
g
t780
0
: run --dir-diff tests with and
wi
t
hout symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
ing
t7800: fix t
e
sts when difftoo
l
uses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7
8
00: don't hide grep ou
t
put
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
di
f
ftoo
l
: d
o
n'
t
overwrite modi
f
ied files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t
7
800: move '--s
y
mlinks' specific t
e
st t
o
the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
o
h
n
K
eep
i
ng
merge
-
tree: fix
t
ypo in merge-tree
.
c
::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
r
efs
.
c
:
fix fread error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keep
i
ng
e
ntry: fix fi
l
t
er lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n
Keeping
t2003: m
o
dernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
d
ifftool --dir-dif
f
: s
y
mlink a
l
l
f
iles matc
h
i
n
g
the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Kee
p
ing
difftool:
a
v
oi
d
double sl
a
shes i
n
symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
ee
p
i
n
g
gi
t
-dif
f
too
l
(
1
):
fix forma
t
ting of --
s
ymlink descr
i
ption
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Ke
e
ping
Rever
t
"g
r
ap
h
.
c:
m
ark p
r
iva
t
e file-sco
p
e symb
o
ls as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
o
hn
Keeping
Makefile: ma
k
e man
d
ir, ht
m
l
d
ir
a
nd
infodi
r
absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn
K
eepin
g
rebase -i:
r
espect core
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
co
m
bi
n
e-diff
.
c: teach c
o
mbin
e
d diffs ab
o
u
t
l
i
ne pr
e
fix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
e
p
ing
diff
.
c
:
use diff_line_prefix() whe
r
e
applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
diff: add diff_
l
ine_pre
f
ix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n Keeping
diff
.
c: ma
k
e
constant
string 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
t
o t
h
e c
o
rrect file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
ohn Keeping
graph: out
p
ut padding for merge subseq
u
ent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
ohn Keeping
t4038: add tests fo
r
"di
f
f
--cc --raw
<
trees
>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
ohn K
e
eping
builtin
/
apply
:
tig
h
ten (dis)s
i
m
i
larity index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
mergetool--lib
:
list user configured
tools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Kee
p
ing
Rename {git- => git}
r
emot
e
-
h
elpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keep
i
ng
Codin
g
G
u
i
d
el
i
n
es
:
a
d
d Py
t
ho
n
co
d
ing guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git
-
remote-testpy: fix path hashing on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
mergeto
o
l
-
-lib: don't
call "exit" in setu
p
_
t
o
o
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
-difft
o
ol:
u
se git-
m
ergetool--
l
ib for "--tool-he
l
p"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
it-mergetool: don't hard
c
ode 'mergetool' i
n
show_tool_hel
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t-m
e
rgetoo
l
: remov
e
redundant
a
ssignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n
Keeping
git
-
mergetool: move show_tool_help to merget
o
ol--li
b
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
-remo
t
e-testpy: call print as a
func
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-remote-testpy: don't do unbuffered
t
e
xt
I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t-re
m
ote-te
s
tpy: hash bytes explici
t
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
svn-fe:
allow svnrdum
p
_sim
.
py to
r
un with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Ke
e
ping
git_r
e
mote_helpers: use 2to3 if
b
u
ildin
g
w
i
th Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keepin
g
git_remote_
h
e
lpers: force rebuil
d
if p
y
th
o
n version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
J
ohn Keeping
git
-
cv
s
impo
r
t
.
t
x
t: cv
s
ps-2 is
d
eprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John
K
e
eping
git-fo
r
-each-ref
.
txt:
'
raw' is a supported date
for
m
at
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keepin
g
gi
t
_remote
_
h
el
p
ers: fix i
n
p
u
t when
r
unning under Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_r
e
mote_helpers
:
allow building with
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
fin
d
near m
a
tche
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
ohn
Keeping
git-fast-
i
m
por
t
(
1
): reorganise option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next