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
Documentation: mention config sources for @{upstream}
2014-03-11
Joh
n
K
eepi
n
g
b
u
i
l
tin/mv
:
f
ix out of bou
n
ds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John Keeping
Makefile: remove r
e
dundant object in git-http{
f
etch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John
Keeping
pull: suppress error
w
he
n
n
o
r
e
m
oter
e
f is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
c
ompletion: h
a
nd
l
e --[n
o
-]fo
r
k-point options
t
o git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
Joh
n
Keeping
completi
o
n: co
m
plete m
e
r
g
e
-
base options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
Joh
n
Keeping
reb
a
se: fix fork-point
wi
t
h
zero arg
u
ments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
J
ohn Keeping
reb
a
se: use reflog to f
i
nd common base with upstre
a
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keeping
pull:
u
se
merge-base -
-
fork-point whe
n
appropri
a
te
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Jo
h
n Keeping
peek-remote: remove deprecat
e
d alias of ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Keeping
lost-
f
o
und: remove deprecated
com
m
a
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keep
i
ng
tar-tree: remo
v
e deprec
a
t
ed com
m
a
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Jo
h
n
K
e
eping
repo-confi
g
: remo
v
e
depre
c
ated alias
f
or "
g
it
config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
Jo
h
n Keepin
g
D
ocu
m
entation/
M
akef
i
le: make AsciiDoc dblatex dir configurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
Jo
h
n Ke
e
ping
merge-recur
s
ive: fix parsi
n
g of "diff-algorit
h
m" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
r
e
set:
handle submodule
with
trailin
g
s
l
ash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Joh
n
K
e
e
p
ing
rm
:
re-u
s
e
parse_pat
h
spec's tra
i
ling
-
slash removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
n Keeping
git_
r
e
mote_helpers:
r
e
m
ove little use
d
Python library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
Jo
h
n Keeping
rev-parse(1
)
: logically gr
o
up opti
o
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
o
hn K
e
e
p
ing
re
v
-parse: remove rest
r
ictions on some options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
p
ull: change the desc
r
i
ption to "integrate" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
K
e
eping
push
:
a
void
s
u
ggesting
"
merging" remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
ohn
K
eeping
git-
c
onfig(1): clarify precedence
of mu
l
tiple valu
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
g
i
t
-config: up
d
ate d
o
c f
o
r
--g
e
t with multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Jo
h
n Keeping
completion: lea
r
n
about
-
-man
-
p
a
t
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Kee
p
ing
completio
n
: handle
u
nstuck form of base
g
it
option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Joh
n
Keepin
g
fast
-
import: all
o
w movi
n
g the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
Keeping
fast-imp
o
rt: allo
w
l
s
o
r filecopy of
t
h
e root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
Keeping
fast-
i
mp
o
rt
:
s
e
t valid mode on root tree i
n
"ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n Keeping
t9300: doc
u
ment fast-import empty path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
s
u
bmodule: drop the
t
op-level r
e
quireme
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
rev-parse: add
-
-p
r
efi
x
opt
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
submodul
e
: show fu
l
l path in err
o
r m
e
ssage
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keepi
n
g
t74
0
3
: add mis
s
i
n
g && ch
a
ining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
t7403: mo
d
ernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t
7
401: make indentation con
s
istent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keepi
n
g
mergetool--lib: refa
c
t
o
r {diff,merge}_cmd logi
c
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Documenta
t
ion/Makefile:
m
ove in
f
odir to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
Doc
u
mentation/M
a
k
e
file:
fix
spa
c
e
s
aroun
d
as
s
ignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
add--i
n
t
e
ractive: respect diff
.
a
lgorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John K
e
eping
g
it-gui
:
fix file na
m
e handling with non-e
m
pty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
fet
c
h: don't try to update unf
e
tched tracking ref
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
Joh
n
Keep
i
ng
difftool: fix dir-diff whe
n
file does
n
ot exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keepi
n
g
mer
g
e
-tree: handle directory
/
empty conflict
correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
J
o
hn Keeping
t/Makefile:
don't d
e
fin
e
TEST_RE
S
ULTS_
D
IRECTO
R
Y
r
ecursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John K
e
eping
c
o
ntrib/subtre
e
:
don't
delete remo
t
e
branches if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
J
ohn Keeping
t
est
o
utp
u
t
: res
p
ect $TEST
_
OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefile
:
remove smok
e
t
e
st targe
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merge
-
tr
e
e
:
fix
t
yp
o
in "b
o
th
change
d
identica
l
ly"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keepin
g
t
/
M
a
kefile: fi
x
result handling with TEST_OUTPUT_DIRECTO
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eepi
n
g
transport-helper:
add 'signed-t
a
g
s' ca
p
ability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
ransp
o
rt-h
e
lper: pa
s
s --signed-tags=warn-str
i
p to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-
e
xpo
r
t:
a
dd
-
-s
i
gned-tags=warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
/test
-
lib
.
sh: fi
x
TRASH
_
DIRECT
O
R
Y
h
a
nd
l
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Kee
p
ing
merge-t
r
ee:
don't pri
n
t entri
e
s that match
"local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Ke
e
ping
gitremote-h
e
lpers(1): clarify refs
p
ec beh
a
viour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
sub
m
o
d
u
le: print graph
output next to
sub
m
od
u
le log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n Keepi
n
g
d
i
ff: allow unstuck arg
u
me
n
ts with --diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John K
e
e
ping
g
i
t-m
e
rge(1)
:
d
oc
u
ment
d
iff-algorithm option to mer
g
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bise
c
t
: av
o
id signed integer
o
v
e
rflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
diff
c
ore-b
r
eak: don't di
v
ide by
z
ero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t78
0
0
:
run --dir-diff t
e
sts
w
ith and without symli
n
ks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepin
g
t7800: fix t
e
sts when
d
iffto
o
l uses --no-
s
ymlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keeping
t7800:
don't hide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
dif
f
tool: don'
t
o
v
e
rwrite m
o
d
i
fied files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepin
g
t7800:
move '--
s
ymlink
s
'
sp
e
cific test
to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keep
i
n
g
merge
-
tree: fix
typo
i
n
merge
-
tree
.
c::unresolve
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keep
i
ng
re
f
s
.
c
: fix
f
read error
h
a
ndling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
entry: fix filter loo
k
up
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
h
n K
e
eping
t2003: mo
d
ernize
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
dif
f
tool --dir-diff: sym
l
ink all fil
e
s
mat
c
hing the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
difftoo
l
: avo
i
d d
o
uble slas
h
es in sym
l
ink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-difftool(1)
:
fix formatting o
f
--symlink
d
esc
r
ip
t
i
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
J
ohn Keeping
Revert "graph
.
c
:
m
a
rk pri
v
ate file-
s
cop
e
symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
Joh
n
Keeping
M
a
kefile: ma
k
e mandir, htmldir
and inf
o
di
r
abs
o
lute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebase -i: respect core
.
co
m
mentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
ep
i
ng
co
m
bine-diff
.
c: tea
c
h combined
diffs about line pr
e
f
ix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
diff
.
c: use d
i
ff_line_prefix() whe
r
e
applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keepin
g
diff:
a
dd
diff_line_pre
f
ix
f
unc
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
i
ng
d
if
f
.
c: make constan
t
s
t
rin
g
arguments
cons
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn
K
e
e
p
i
ng
d
iff: write prefix t
o
the correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John K
e
eping
graph: outpu
t
p
a
ddin
g
for
merge
subsequent paren
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
ohn Keeping
t
4
038: add tes
t
s
for
"
diff -
-
cc
-
-
r
aw <
t
r
ees>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin/ap
p
ly: ti
g
h
t
en (dis)similarity index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
merget
o
ol
-
-
l
ib: list user co
n
fig
u
red t
o
ols in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John
Keeping
Ren
a
me {gi
t
- => g
i
t}re
m
ote-help
e
rs
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
ohn Ke
e
p
i
ng
C
o
dingGuidelines:
a
dd P
y
thon coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
g
i
t-remote
-
t
estpy: fix path
h
ashing on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keep
i
ng
m
e
rgetool--lib: don't call "exi
t
" in s
e
tup_
t
ool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t-difftool: use
g
i
t-mergetool--li
b
for
"
--to
o
l-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
hardcod
e
'
mergetool' in show_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git-merg
e
to
o
l: remove redundant a
s
s
ignm
e
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergetool: mo
v
e s
h
ow_tool_
h
elp
to mergetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git-r
e
m
ote
-
te
s
tpy: call pri
n
t as a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
git-remote-
t
est
p
y: don't do unb
u
ff
e
r
e
d te
x
t I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n
K
eeping
git-rem
o
te-tes
t
p
y
: hash
b
y
tes
e
x
p
licitl
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
svn-f
e
:
a
ll
o
w
svnr
d
ump
_
s
i
m
.
py
t
o run with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git
_
remote_hel
p
ers: use 2to3 if building with Pytho
n
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 versio
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
Jo
h
n
Keeping
git-cvsimport
.
txt
:
c
vsps-2 is deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John
K
eeping
git-for-each-ref
.
txt: 'raw' is a suppo
r
ted da
t
e
f
o
r
m
at
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next