repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/revision-range-unpeel'
2014-01-17
Jo
h
n Keepi
n
g
pull: suppres
s
error w
h
en no remoteref is fou
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keep
i
ng
c
o
mpletion: handl
e
--
[
no-]fork-point o
p
t
i
ons to gi
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
Jo
h
n Keep
i
n
g
completion
:
compl
e
te merge-base options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
Jo
h
n Keeping
reb
a
se: fix fork-
p
oi
n
t with ze
r
o arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
Joh
n
Kee
p
ing
reb
a
se
:
use refl
o
g to
find common base wit
h
u
p
s
t
re
a
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Kee
p
i
n
g
pull: use
m
erge-b
a
se
--fork-po
i
nt when appr
o
priate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Jo
h
n K
e
eping
pee
k
-
r
emote: r
e
move deprecated
a
lias of
ls-rem
o
te
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
h
n
Ke
e
p
ing
lost-f
o
und: remove d
e
pre
c
ated co
m
mand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
tar-tree: remov
e
deprecated comma
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John K
e
epi
n
g
repo-config: remove
depr
e
cated alias for "git config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
Joh
n
Keep
i
ng
Documenta
t
ion/M
a
kefil
e
: ma
k
e
A
sc
i
iDoc dblatex dir
c
o
n
f
i
gurab
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
J
o
h
n
Ke
e
pi
n
g
merge-rec
u
r
s
i
v
e
: fix parsing of "
d
iff-algorithm"
opt
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Ke
e
ping
reset: handle sub
m
odule with
tra
i
ling
s
lash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm: re-use parse_pathsp
e
c's tr
a
ilin
g
-slash remov
a
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Keeping
git_remo
t
e_helpers
:
remove little used
Pyth
o
n
libr
a
ry
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John
K
eeping
r
e
v-pa
r
se
(
1): logic
a
ll
y
group op
t
ion
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John K
e
e
p
ing
rev-parse: remove re
s
trict
i
ons on some options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John
K
eeping
pull
:
change the description to
"
integrate" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
ohn Keeping
pu
s
h: a
v
o
i
d sugge
s
ting "merging" remo
t
e changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
o
h
n
Keeping
git-config(1):
c
lari
f
y precedenc
e
of m
u
lt
i
ple val
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John
Ke
e
ping
g
it
-
config: update doc for --get with multiple val
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
o
h
n K
e
eping
completion
:
learn about
--man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Kee
p
ing
c
ompletion: handle u
n
s
t
uck form of base git
o
pti
o
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-import: a
l
l
o
w
mo
v
ing the root t
r
ee
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
f
a
st-
i
mport: allow ls
or filecopy of the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn Ke
e
p
i
n
g
fa
s
t-import:
s
et valid mode on root t
r
ee in "l
s
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
h
n K
e
e
ping
t9300: d
o
cument fast-import empty path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keepin
g
submodule: drop th
e
top-le
v
el
r
equiremen
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
r
e
v-parse:
add --prefix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submod
u
le: s
h
ow
full path
in
e
rror message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403: add mis
s
ing && chain
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t
7403:
m
o
d
ernize styl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keeping
t
7
4
0
1: m
a
ke i
n
dentat
i
on cons
i
st
e
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
mer
g
e
tool--lib: refac
t
o
r
{diff,merge}_cm
d
logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
Docum
e
nt
a
tion/Makef
i
le: m
o
ve
i
nfodir to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Documentation/
M
akefi
l
e: fix spaces around
a
ssignme
n
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keepi
n
g
a
d
d--i
n
t
eractiv
e
:
r
espect
d
i
f
f
.
a
l
gorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Ke
e
pi
n
g
git-g
u
i: fix f
i
le name handli
n
g wit
h
non-em
p
ty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
J
o
hn Keeping
fetch: don
'
t
try to update unfetched trac
k
ing refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
dif
f
tool: fix dir-diff when file does not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
Joh
n
Keeping
merge-tree:
handle dir
e
ctory/empty conflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Kee
p
in
g
t/Mak
e
f
ile: don't d
e
fine TES
T
_RESU
L
TS_DIRECTORY recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Kee
p
ing
cont
r
ib/su
b
t
r
ee: don't delet
e
r
emote
branches if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test output: respect
$
TEST_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Ke
e
ping
t/Ma
k
efi
l
e:
r
e
move smok
e
test target
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merge-
t
ree: fix typo in "both change
d
identicall
y
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
Jo
h
n Kee
p
i
n
g
t/Makef
i
le
:
fix r
e
su
l
t
handli
n
g
with T
E
ST_O
U
TPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
ping
transp
o
rt-helper: add 'signed
-
t
ags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
p
i
ng
tr
a
n
spo
r
t-
h
elper:
p
ass --signe
d
-ta
g
s=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
f
ast-
e
xport:
a
d
d
--signed-tags=w
a
rn-st
r
ip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/test-
l
ib
.
sh
:
f
ix TRASH_DIRECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-t
r
ee:
d
o
n't print entries that match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keepi
n
g
gitremote-he
l
pers(1): clarify refspec
b
e
ha
v
iour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eeping
submodule: print graph output next to submodule lo
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
Ke
e
ping
diff:
allow unstuck a
r
guments with --diff-alg
o
ri
t
hm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Ke
e
ping
git-m
e
rge
(
1): document
diff-algorithm opti
o
n to merg
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn Keeping
bisect: avoi
d
si
g
ned integer overflo
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Ke
e
ping
diffcore-break:
d
on't
d
ivide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: run --dir-diff tests with and with
o
ut
symli
n
ks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t
7800: fi
x
tests w
h
en difftool uses -
-
no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepi
n
g
t7800: do
n
't hide grep o
u
tput
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
diff
t
ool
:
d
on't
overwrite modified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t780
0
: move '--
s
ymli
n
ks' specifi
c
test
t
o th
e
en
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
ohn Keeping
merge-t
r
ee
:
fix typo in
m
e
r
ge
-
tree
.
c:
:
unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keep
i
ng
refs
.
c: fix fread error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
e
e
ping
entry: fix filter l
o
ok
u
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
ep
i
ng
t2003: mo
d
ernize styl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n
Keepi
n
g
difftool -
-
dir
-
diff: sy
m
link all files
m
atching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
e
eping
difftool: avo
i
d doubl
e
slashes i
n
symlin
k
targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-difftool(1): fix form
a
tting of --symlink d
e
scription
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
Jo
h
n Keepin
g
Revert "g
r
ap
h
.
c:
mark
p
riva
t
e file-scope symbol
s
as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keep
i
ng
M
a
kefile
:
make man
d
ir, htmldi
r
and inf
o
dir
a
bsolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n
Ke
e
ping
rebase -
i
:
respect c
o
re
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
combine
-
d
iff
.
c: t
e
ach
com
b
ined diffs
about line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
diff
.
c: use d
i
ff_
l
ine_prefix() w
h
e
re applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
iff:
add diff_line_
p
re
f
ix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
d
i
ff
.
c: make constant str
i
n
g a
r
guments con
s
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
dif
f
: write prefix to the
c
o
r
re
c
t f
i
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
Joh
n
Keeping
graph: output padding
for merge subsequent parent
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keepin
g
t4038: add tests fo
r
"diff --cc --raw <tr
e
es>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keepin
g
bu
i
l
tin/apply
:
tighten (di
s
)
s
im
i
larity inde
x
parsi
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
mergeto
o
l--lib
:
l
ist user conf
i
g
u
red tools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keepin
g
Ren
a
me
{git- => git}r
e
mote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
C
odingGuidelines: add Python coding guide
l
ines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-remote-test
p
y: fix
p
ath hashing
o
n
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
Jo
h
n Keeping
mergetool--lib: don't
call
"exi
t
" in
s
e
t
u
p
_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git
-
di
f
ftool: use
git-m
e
rgetool
-
-lib for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git-mergetool: don't hardcode 'mergetool' in show_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mer
g
etool: remove
r
edundant assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git-mergetool: move show_tool
_
help to mergetool-
-
lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
g
i
t-remote-testpy: call
print a
s
a
function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John 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
John K
e
eping
git-remote-t
e
stp
y
: has
h
byte
s
expli
c
itly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
svn-fe: allow sv
n
r
dump_s
i
m
.
py to
r
un with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
K
e
e
p
ing
g
i
t_
r
emote_helpers: us
e
2to3 if build
i
ng with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git
_
remote_helper
s
: force rebuild if python
version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
J
o
hn
Ke
e
ping
git-cvsimport
.
txt: cvsps-2
is deprecat
e
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John
K
eeping
g
i
t-fo
r
-
e
ac
h
-r
e
f
.
t
x
t:
'
raw' is
a
s
upported date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
g
it_
r
e
mote_helper
s
: fix input when running
under Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_r
e
mote_he
l
pers: allow building with Pyt
h
on 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next