repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'nd/negative-pathspec'
2014-01-17
John Kee
p
ing
pull:
suppr
e
s
s error when no r
e
mot
e
r
ef is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
complet
i
on: handle -
-
[no-]fork-poin
t
options to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
Jo
h
n
K
e
epin
g
comp
l
e
t
ion: complete merge-base optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John
Keeping
r
e
b
ase: fix fo
r
k-point wi
t
h zero argume
n
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
J
o
h
n
Keeping
reba
s
e: use reflog t
o
find c
o
mmon base
w
i
t
h upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John
K
eepin
g
pull: use me
r
ge
-
ba
s
e --fork-point when
ap
p
ropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Joh
n
K
e
eping
peek-remote: remove depre
c
ated a
l
ias of ls-r
e
mote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
lost-found
:
r
emo
v
e depre
c
ated com
m
and
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Jo
h
n Keeping
tar-tree: remove dep
r
ec
a
t
e
d
command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keep
i
ng
repo-config: remove d
e
precated ali
a
s for "git config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
Do
c
umentation/Makefi
l
e:
make AsciiDoc d
b
latex d
i
r configurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
m
erge-recursive:
f
i
x parsing
of "diff-
a
lgorith
m
" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John
Keeping
reset: h
a
ndle submodule with trailing sl
a
sh
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm
:
re-use
parse_pathspec's tr
a
ilin
g
-
s
lash remo
v
al
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John
Keeping
git_remote_helpers
:
r
e
m
ove little used Python librar
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John K
e
eping
r
ev-pars
e
(
1
)
: logicall
y
grou
p
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keep
i
n
g
r
e
v-parse: r
e
move restricti
o
ns on
s
om
e
opti
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
p
u
l
l
: change
the description to
"i
n
t
e
grate" c
h
a
nges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John K
e
epin
g
push
:
av
o
id
su
g
gestin
g
"
m
e
rging" remote c
h
an
g
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Jo
h
n
Ke
e
pi
n
g
git-con
f
ig(1
)
: clarify pr
e
cedence of multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
git
-
c
onfig: update d
o
c f
o
r --ge
t
with
m
u
l
tip
l
e values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Jo
h
n Keeping
complet
i
on: learn abo
u
t --man-pat
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
o
hn Keeping
completion: handle unstuck form of base git option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keep
i
ng
fast-
i
mport: allow mov
i
n
g
the ro
o
t tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
eepin
g
fast-imp
o
rt: allow ls or file
c
opy
o
f
the root
t
ree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n Keeping
fast-
i
mpor
t
: set valid mod
e
on
r
oo
t
t
r
ee in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Keeping
t9
3
00: do
c
ument fast-import empty
p
ath issue
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
s
u
bmodul
e
: dr
o
p the top-l
e
vel requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
ng
r
e
v
-pa
r
se: add --prefix op
t
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
subm
o
dule: show full path in
error me
s
sage
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403: add
m
issing &&
chai
n
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eep
i
ng
t7403: moderniz
e
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
pin
g
t7401
:
make indentation consi
s
tent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
me
r
getool--lib: refactor
{diff,merge}_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Documen
t
atio
n
/Makefile:
m
ove infodir to
b
e wit
h
other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
i
ng
Documentation/Ma
k
efile:
fix spaces around assign
m
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
a
dd--i
n
teractiv
e
: resp
e
ct
d
i
ff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
J
o
hn Keeping
g
i
t-gui: fix file name hand
l
ing with non
-
empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
J
o
h
n
Keeping
fetc
h
:
don't try to
update un
f
et
c
hed
t
rack
i
ng
r
ef
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
Jo
h
n Keeping
d
i
fftool: f
i
x dir-d
i
f
f when
file does
not
e
xist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-tree: handl
e
directory/empty conflict correct
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John K
e
eping
t/Mak
e
file:
d
o
n
't def
i
n
e
TEST_RESULTS_DIRECTORY recursi
v
e
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John
K
eeping
contrib/
s
ubtree: don't delete remote branches if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test ou
t
put: r
e
spect $TEST_OUTPUT_DIRECTOR
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Joh
n
Keeping
t/
M
akefile:
r
emove
s
moke
test t
a
r
gets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Kee
p
ing
merge-tre
e
:
fix typo in "both chan
g
ed identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
J
o
hn Keeping
t/Makefile: fix result handl
i
ng with TEST
_
OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
pin
g
tr
a
ns
p
ort
-
helper: add 'signed-
t
ags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
trans
p
ort-he
l
per: p
a
ss --signed
-
tag
s
=warn-
s
trip
to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
eping
fast
-
export: add -
-
s
i
gned-
t
ags=warn-stri
p
m
ode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
i
ng
t/te
s
t-lib
.
sh: fix TRASH_DIRECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John
K
eeping
merge-tree: don'
t
print ent
r
ies that mat
c
h "loca
l
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitremote-helpers(
1
):
clarify refspec
b
ehaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keepin
g
su
b
module: print grap
h
outp
u
t next to
s
u
b
module log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n Keeping
dif
f
: allow unstuck
a
rguments
w
ith --
d
iff-a
l
gorith
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n
K
e
eping
gi
t
-merge
(
1): docum
e
n
t
diff-al
g
o
rithm o
p
tion t
o
mer
g
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisect
:
avoid signe
d
integer overfl
o
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keepin
g
diffcore
-
bre
a
k
:
d
on't divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepi
n
g
t
7800: run --dir-diff
te
s
ts wit
h
and without s
y
mlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7
8
00: fix tests wh
e
n difftool uses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepi
n
g
t
7
8
0
0: don't hide grep
o
u
tp
u
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
difftool: don
'
t overwrit
e
m
odified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
t
7
80
0
: move '--
s
y
mlin
k
s' specific test to the
e
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John
K
eeping
merge-tree: fix ty
p
o
in m
e
rge-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c
:
fix fread error h
a
ndling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keepi
n
g
e
n
try
:
fix filte
r
l
o
okup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepi
n
g
t2003:
modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eepin
g
difftool
--dir-diff:
s
ymli
n
k
all files matching t
h
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepin
g
d
iff
t
ool: avoid double s
l
ashes in s
y
mlink t
a
r
g
ets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
oh
n
Keeping
git-difftoo
l
(1): fix
formatting of --symlink description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
J
o
h
n
Ke
e
ping
Revert
"
graph
.
c: mark p
r
iva
t
e file-scope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Ke
e
pi
n
g
Makefil
e
: make mandir, html
d
ir and infodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
n
g
rebase -i: respect core
.
com
m
entchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
combin
e
-d
i
ff
.
c
:
teach
c
ombined diffs about line
p
re
f
ix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: use diff_line_p
r
efix(
)
whe
r
e app
l
icable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
epin
g
dif
f
: add diff_line_pref
i
x funct
i
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn
K
ee
p
ing
diff
.
c: m
a
ke c
o
nsta
n
t
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: wri
t
e prefix to the c
o
rrect
file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
ohn Keeping
graph: o
u
tpu
t
pa
d
ding
for merge subs
e
quent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John K
e
eping
t4038: add tests for "diff -
-
cc --raw <tre
e
s>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n
K
eeping
builtin/app
l
y: tighten (dis)
s
i
m
il
a
rity index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Ke
e
ping
mergetool--li
b
: list user
c
o
n
f
i
gure
d
tools in '--
t
ool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
ohn
Keeping
Ren
a
me {git- => git}remote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
C
o
dingGu
i
delin
e
s: add
P
y
t
h
on coding guid
e
lines
commit
|
commitdiff
|
tree
2013-01-28
John
K
eep
i
n
g
gi
t
-remote
-
testpy: fix path hashing o
n
P
ython 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
Joh
n
Keeping
me
r
g
etool--li
b
: don't call "exi
t
" in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Ke
e
p
i
ng
git-d
i
fft
o
o
l
: use git-m
e
r
g
etool--
l
i
b
for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git-mergetool:
d
on't hardcode 'mergetoo
l
' in show_tool_h
e
lp
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git-merge
t
ool: remo
v
e redundant assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t-mergetool: move
s
h
ow_tool_help to mergetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git-
r
em
o
te-t
e
s
tpy:
c
all p
r
int
a
s a f
u
nction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git-remote-testpy: don't do un
b
uffere
d
text
I
/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remo
t
e-testpy: ha
s
h bytes explicitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
svn-fe: allow s
v
n
r
dum
p
_
sim
.
py to run with P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_remote
_
helper
s
: use 2to3 if buildin
g
wit
h
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
git_remot
e
_
h
elpers: f
o
rce
r
ebuild
i
f python version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
Joh
n
Keeping
git-
c
vsi
m
port
.
txt:
c
vsps-2 is dep
r
ecated
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 supported date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
ohn Keeping
g
i
t_remote
_
helper
s
: fi
x
i
nput whe
n
runn
i
ng und
e
r Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Ke
e
pi
n
g
git_remote_h
e
lpers
:
allow build
i
ng with Pyth
o
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next