repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
request-pull: documentation updates
2014-01-17
John Keeping
pu
l
l
:
s
up
p
ress er
r
or when no remoteref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Ke
e
ping
rebase: fix fork-point
w
ith
z
ero ar
g
umen
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John
K
eepin
g
rebase: use reflo
g
to find common b
a
se wit
h
up
s
tream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John K
e
eping
pull: use merge-
b
as
e
--
f
o
rk-point when appropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
K
eeping
peek-rem
o
te:
remove
d
e
p
recated alias of ls-
r
emote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
lost-found: remov
e
deprecate
d
c
om
m
and
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn Keeping
ta
r
-t
r
ee:
r
e
move depreca
t
ed com
m
and
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Keeping
repo-config:
r
e
m
o
ve deprecated alias f
o
r "g
i
t conf
i
g"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John K
e
eping
D
o
cumentatio
n
/
M
akefile: make AsciiDo
c
d
b
latex dir configurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
J
o
hn Keeping
m
erge-rec
u
r
s
ive: f
i
x
p
a
rsing of "diff-a
l
gor
i
thm"
o
p
tio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rese
t
:
h
andle submodule with tr
a
ili
n
g
slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Joh
n
Keeping
rm:
re-use parse_pat
h
s
p
e
c
's
t
railing-slash
r
emov
a
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Keeping
git
_
remote_helpers: remove li
t
t
l
e used Python li
b
rary
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
o
h
n
Keeping
rev-parse
(
1): logically group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
o
hn Keeping
r
e
v-parse
:
remov
e
res
t
r
ictions
on some opt
i
on
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pull: change the d
e
s
cription t
o
"
i
ntegra
t
e"
c
hanges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Kee
p
in
g
push: avoid s
u
gg
e
sting
"
me
r
gin
g
" r
e
mote c
h
anges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
git-config(1): clarify precedenc
e
of mul
t
iple va
l
ues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
git-config: update
d
oc f
o
r
--ge
t
w
ith multip
l
e values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
completio
n
:
learn about --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John
Keeping
com
p
letion: handle uns
t
uck form
o
f
b
ase git opti
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fa
s
t-import: all
o
w moving
t
he root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-im
p
ort:
al
l
ow ls or
filecopy
o
f
t
he ro
o
t tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
f
a
st-import: set valid mode on roo
t
tree in
"
ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t9300: document fast-i
m
port empty path
issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule:
d
rop the
t
op-level requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
rev-parse:
add --prefix opti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
su
b
m
o
d
ule: show full p
a
t
h
in er
r
or message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
t740
3
: add
m
issing && cha
i
ni
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
t7403: modernize
s
tyle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
t7
4
01: make
indentation consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n K
e
ep
i
ng
m
ergetool--lib: refactor {dif
f
,merge}_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
Docume
n
tat
i
on/Ma
k
efile
:
m
ov
e
in
f
odir to be with oth
e
r
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
i
n
g
Docu
m
entation/Makefile: fix sp
a
c
e
s a
r
ound assignmen
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keepi
n
g
add--i
n
teracti
v
e:
respe
c
t
diff
.
al
g
orithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keeping
git-gu
i
:
fix fi
l
e name handli
n
g wi
t
h no
n
-
empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keep
i
ng
fe
t
ch: don
'
t try to update unf
e
t
c
h
ed track
i
ng refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keep
i
ng
difftool: fix
dir-
d
iff wh
e
n
fi
l
e
d
oes
n
o
t exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
J
ohn Keeping
mer
g
e-tree: handle di
r
ectory
/
empty conflic
t
correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/Makefil
e
:
don't def
i
ne TEST_RESULTS_DIRECTORY recurs
i
vely
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
J
o
hn K
e
e
ping
c
o
n
t
rib
/
s
ubtree: d
o
n
't d
e
let
e
remote bran
c
hes if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
Joh
n
Kee
p
ing
test
o
utput: respect
$
TEST_
O
U
TPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn
K
eeping
t
/
Makef
i
le: remo
v
e smoke test
t
ar
g
ets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn Keeping
merge
-
tree: fix typo
in
"
b
oth changed identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t
/
Mak
e
file: fix result ha
n
dling
w
i
th
T
EST_
O
UTPUT_DIRECTO
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keep
i
ng
t
r
an
s
port-helper:
add 'signed-t
a
g
s
' capabi
l
it
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eeping
tra
n
sport-helper: pass --signed-tags=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
f
as
t
-e
x
port:
ad
d
--signe
d
-tags=warn-s
t
rip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
ng
t
/test-
l
ib
.
sh:
f
ix TRAS
H
_DIRECTORY h
a
nd
l
i
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-tr
e
e
: don't p
r
int entr
i
es t
h
at ma
t
c
h "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
Jo
h
n Keeping
gitr
e
mote-hel
p
er
s
(1): clarify
refs
p
ec
b
ehaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n
Keeping
submodule:
p
rint graph output ne
x
t
t
o submodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
d
iff
:
allow unstuck arguments
w
ith
--diff-algori
t
hm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eep
i
n
g
git-merge(1): docu
m
ent diff-alg
o
rithm o
p
tion to m
e
rge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisect: avoid sig
n
ed i
n
teger overflo
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn Keep
i
n
g
diffcore-break
:
don't divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Ke
e
ping
t
7800: run
-
-
dir-diff tests wi
t
h and wi
t
h
o
ut symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
h
n Keepin
g
t7
8
00: fix t
e
s
ts when diffto
o
l
u
s
e
s --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keep
i
ng
t7800:
don't hide grep out
p
ut
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
d
i
ffto
o
l: don't
o
verwrite modifi
e
d
files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keep
i
ng
t
7800: move '--symlinks'
s
pecific test
to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
merge-tr
e
e:
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
e
rror handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eeping
entr
y
: fix fil
t
er
l
ook
u
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Keeping
t2003: m
o
dernize
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
ping
difftool --dir-diff: s
y
mlink all fi
l
es
matching t
h
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
difftool: av
o
i
d double slashes
i
n symlin
k
tar
g
et
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
git
-
difftool(1): f
i
x formatting of --sy
m
li
n
k de
s
cript
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John K
e
epin
g
R
e
ver
t
"gr
a
ph
.
c: mar
k
p
rivat
e
file-sco
p
e symbols a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Mak
e
file: m
a
ke mandir, htmldir and
i
nfodir
ab
s
olute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
r
e
bas
e
-i: respect core
.
c
ommentcha
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
comb
i
n
e
-diff
.
c: teac
h
c
o
mbined d
i
ffs about line
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n
Keepin
g
dif
f
.
c: use dif
f
_line_prefix() where applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eeping
dif
f
: a
d
d di
f
f_
l
ine_pr
e
fix
f
uncti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
diff
.
c: ma
k
e con
s
t
a
nt string arguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
diff: write prefix
to the correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
o
hn Keeping
graph: outp
u
t paddi
n
g fo
r
merge subsequent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t403
8
: add
t
ests f
o
r "
d
iff --cc --
r
aw <tr
e
es>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin/apply: tighten (
d
i
s
)similari
t
y ind
e
x parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
ohn Keep
i
ng
mergetool--lib:
l
ist user configured tools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
R
e
name {gi
t
- =
>
g
it}re
m
o
t
e
-
hel
p
e
r
s
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John
Keeping
CodingGuidelines: add Python
c
odi
n
g
guideline
s
commit
|
commitdiff
|
tree
2013-01-28
John Keepi
n
g
git-remot
e
-
t
estpy:
f
ix pat
h
has
h
i
n
g on Py
t
h
on 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keep
i
ng
mergetool
-
-lib:
d
on't c
a
ll "exit" in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-diff
t
ool: us
e
g
i
t-merge
t
o
ol--li
b
for "--tool
-
h
elp"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git-mergetool: don't hardcode 'm
e
rg
e
tool
'
in sh
o
w_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git-merg
e
to
o
l: rem
o
ve redundant
assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mer
g
etool: move show_
t
ool_
h
elp to mergetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keepi
n
g
git-remote-
t
es
t
py: call
p
r
int as
a f
u
nction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
g
it-r
e
mote-t
e
stpy: don't d
o
un
b
u
f
fer
e
d
t
ext I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-rem
o
t
e
-tes
t
p
y: hash bytes explicitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
svn
-
f
e: allow svnrdump_sim
.
py to run with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_remote_helpe
r
s:
use 2to3 if b
u
il
d
ing with
Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
it_remote_
h
elpers:
f
orce rebui
l
d if pytho
n
v
ersion
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Ke
e
p
i
n
g
git-cvsim
p
ort
.
t
x
t:
c
vs
p
s
-2 is depr
e
cate
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Kee
p
ing
git-for-each-ref
.
txt: 'r
a
w' is
a supporte
d
dat
e
format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
gi
t
_r
e
mote_he
l
pers: fix input when runnin
g
unde
r
P
ython 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John
Kee
p
ing
git_remote_helpers
:
allow
b
uilding with Py
t
hon
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keep
i
ng
git-svn: teach find-rev to
f
i
nd nea
r
matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fast-import(1
)
:
reorgan
i
se options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next