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
Merge git://git.bogomips.org/git-svn
2013-12-10
John Keeping
r
e
b
a
se:
u
se r
e
flog to find common base with upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
Jo
h
n Keeping
p
ull:
use
merg
e
-
base --fork-point when app
r
o
p
r
iate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn Keeping
peek-remote: remove deprecated a
l
ias of
l
s-rem
o
te
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Joh
n
Keeping
lost-found: r
e
move
d
e
p
recated
c
o
mmand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Keep
i
n
g
tar
-
tre
e
: remove depre
c
ated comman
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
r
e
p
o-config
:
re
m
ove deprecat
e
d
alia
s
for
"git c
o
nfig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
Jo
h
n
K
eeping
Documenta
t
ion/Ma
k
efile: make A
s
ciiDoc dblat
e
x
dir configurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
merge-recursive: fi
x
parsing of "diff-algor
i
t
h
m" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
reset: handle
s
ubmo
d
ule with trailing
slas
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm: r
e
-
u
se parse_pathspec
'
s
trailing-slas
h
removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
n Kee
p
i
ng
g
it
_
remote_helpe
r
s
:
remov
e
lit
t
l
e
u
s
ed Pyth
o
n libra
r
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
ohn
Keepi
n
g
rev
-
parse(1):
l
o
gica
l
l
y group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
Joh
n
Ke
e
ping
rev-parse:
r
e
move restrictions on some options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pu
l
l: change the description to "integrate" c
h
a
nges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
o
h
n
K
eeping
pu
s
h
: avoid suggesting "m
e
rging
"
re
m
o
t
e
changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
Keeping
git-confi
g
(1):
cla
r
if
y
preced
e
nce of multiple value
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
J
oh
n
Keeping
git-confi
g
:
u
pda
t
e doc fo
r
--get with
multi
p
le values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keepin
g
comp
l
etion: learn
a
bout --
m
an-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John K
e
eping
comple
t
i
o
n
:
h
andle
unst
u
ck f
o
rm
of base
g
i
t
op
t
io
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
eeping
fast-import: allow moving the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n Ke
e
ping
fast-imp
o
rt: allow ls or filecopy of
t
h
e
root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
eeping
fast-import: se
t
valid mode on
root tree in "ls
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t9300
:
d
o
c
ument fast-import
e
mp
t
y pat
h
is
s
u
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
s
u
bm
o
dule: drop the top-level requ
i
rem
e
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keeping
rev-parse:
add
-
-
pref
i
x opt
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
submodule: sho
w
f
ull
pa
t
h in
e
r
r
o
r
m
essage
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
oh
n
K
e
eping
t
7
403: a
d
d missing && cha
i
ning
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
ng
t74
0
3
:
modernize
st
y
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keep
i
ng
t7
4
01: make indentation consisten
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
m
e
r
getool--lib: refactor {di
f
f
,
merge}_c
m
d logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
Documentat
i
on/Makefile: move infodir to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Ke
e
ping
Documen
t
a
t
ion/Makefile: fix spaces aro
u
nd assignment
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
add--
i
nteractive: respect
d
iff
.
alg
o
ri
t
hm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keeping
git-gui: fix file
name handl
i
ng
w
ith non
-
empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
fetch: don't
t
ry to u
p
date un
f
etched tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
difftool:
fi
x
dir-diff when f
i
le does not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-tree: ha
n
dle di
r
ector
y
/empty conflict co
r
rectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/Ma
k
efile: don't defi
n
e
TEST
_
R
E
SULTS_DIRECTORY recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keepin
g
contrib/subtree
:
don't delete rem
o
t
e
branche
s
if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
tes
t
output: r
e
spect $TEST_
O
UTPUT_DIR
E
CTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Joh
n
Ke
e
ping
t/Makefil
e
: remove smoke test
t
argets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John
K
eepi
n
g
m
erge-tree: fix typo in "both chang
e
d
i
d
e
ntically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Ke
e
pin
g
t
/
Make
f
ile:
fix
r
esult handl
i
ng wit
h
TEST_OUTPUT_D
I
R
E
CTOR
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Ke
e
ping
transport-helper: add 's
i
gned-t
a
gs' capabil
i
t
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
eping
transport-helper: p
a
ss
--signed-tags=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
f
ast-export:
a
d
d --sig
n
ed
-
tags=warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n Keeping
t/tes
t
-lib
.
sh
:
fix TRASH_D
I
RECTORY handl
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
J
o
hn Keeping
mer
g
e-
t
ree: don't print entries that ma
t
ch "loca
l
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gi
t
r
emote-h
e
lpers(1): c
l
arify refspec beh
a
v
iour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John K
e
eping
subm
o
dule: print graph o
u
tput next
to submo
d
ule
log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
h
n
Keepi
n
g
diff: allow un
s
tuc
k
ar
g
uments
with
-
-diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn Keeping
g
i
t-merge(1): document diff-algor
i
thm o
p
tion to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Keepin
g
b
i
sect: avoid si
g
ned integer overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Keepi
n
g
dif
f
c
o
r
e
-break: do
n
't divide
by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t7800: run --
d
ir-diff test
s
w
i
th a
n
d wit
h
o
ut
s
y
m
links
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keeping
t7
8
0
0: fix t
e
s
t
s
when dif
f
tool us
e
s --no-sym
l
inks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t7800: d
o
n
'
t hide grep outpu
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Keepi
n
g
d
i
f
ftool: don't
o
verwrite mod
i
fied files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eeping
t7
8
00: move '--symlinks' specific
t
est to
t
h
e end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
Joh
n
Keeping
merge-tree: fi
x
t
y
po in
merge-tree
.
c::unresol
v
e
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
Jo
h
n Keeping
refs
.
c: fix f
r
ead e
r
ror
han
d
ling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
entry: fix filter look
u
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2003: moderniz
e
styl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn
K
eeping
difftool --dir-diff: sy
m
link all files
m
atc
h
i
ng t
h
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
dif
f
tool: a
v
oid doubl
e
slashes in symlink target
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-dif
f
too
l
(1): fix for
m
a
tting of --sy
m
link description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
R
evert
"graph
.
c
: mark
p
r
ivate
file-
s
cope
s
ymbo
l
s
as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Makefile
:
make mandir, ht
m
ldi
r
and i
n
fodi
r
absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
e
e
p
i
n
g
rebase -i: respect core
.
com
m
entcha
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keepin
g
co
m
bine-diff
.
c: teach combine
d
diffs about line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
dif
f
.
c:
u
se d
i
ff_line_prefix
(
) where applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Ke
e
ping
d
i
ff: add diff_l
i
ne_prefix functi
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
diff
.
c: mak
e
const
a
n
t
st
r
i
n
g arg
u
ment
s
con
s
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
diff: write prefix to the corr
e
ct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Ke
e
ping
g
raph
:
output paddi
n
g for m
e
rge su
b
s
equ
e
nt p
a
re
n
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
o
h
n Keeping
t4038: a
d
d
tests for "diff
-
-cc --raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n Keeping
builtin/apply: tight
e
n (dis)si
m
ilarity in
d
e
x
parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
h
n
Keeping
mergetool--
l
ib: li
s
t user
c
onfigured tools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keep
i
n
g
Renam
e
{git- => git
}
remote-help
e
rs
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
o
hn Keepi
n
g
CodingGuidelines: add Python coding guidel
i
nes
commit
|
commitdiff
|
tree
2013-01-28
J
o
hn Keeping
git-remot
e
-testpy: fix
pat
h
hashing on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
Jo
h
n Keeping
mergetool-
-
l
i
b
: don't
call "
e
xi
t
" in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-d
i
fftool: use git-mergetool--li
b
for "--tool-help
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n
Keeping
g
it-m
e
rgetool: don't
hard
c
o
d
e 'mer
g
e
tool' in show_
t
ool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
e
p
ing
git-merge
t
ool: remove redundant a
s
signment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keepi
n
g
git-merg
e
tool: move show_to
o
l_h
e
lp to
mergetool--
l
ib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
-remote-tes
t
py: call pr
i
nt as a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
g
i
t
-
re
m
o
t
e-te
s
tpy: don't do unbuffered
t
e
xt I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n
Keeping
git-remot
e
-t
e
stpy: hash bytes explicitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
svn-fe: allow svn
r
dum
p
_s
i
m
.
py to run with Pyt
h
on 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
g
i
t_remote_helpe
r
s: use 2to3 if building with Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keepi
n
g
g
i
t
_remot
e
_he
l
pers: force reb
u
ild if pyt
h
on
v
ers
i
o
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
J
oh
n
Keeping
git-cvsi
m
po
r
t
.
txt: cvs
p
s
-2 is d
e
p
recate
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keeping
git-
f
o
r
-
each-ref
.
txt:
'raw'
i
s a
s
upported date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
o
h
n
K
eep
i
ng
gi
t
_remote_helpe
r
s: f
i
x input
w
hen running un
d
er P
y
th
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
Joh
n
K
e
eping
g
i
t_rem
o
t
e_helpe
r
s: allow
build
i
ng
with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Kee
p
i
n
g
git-svn
:
tea
c
h find-rev
t
o
f
i
nd near matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
o
hn
K
e
e
ping
gi
t
-fast-imp
o
rt(1): reorganise options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keepi
n
g
git-fa
s
t-impo
r
t(1): combine do
c
umentation of --
[
no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Ke
e
ping
git
-
s
h
ortl
o
g(1):
d
ocument behavi
o
ur of zero-width w
r
ap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next