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 branch 'fc/remote-helper-fixes'
2013-12-10
John Keeping
rebase: us
e
reflog t
o
find common base wi
t
h u
p
stream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keeping
pull:
use merge-
b
ase --
f
ork-poi
n
t when appropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn
Keeping
peek
-
remote: remove
depr
e
cat
e
d alias of ls
-
rem
o
te
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
lost-found: remove
d
eprecate
d
com
m
a
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn Keeping
tar-t
r
ee
:
remove deprec
a
ted
comm
a
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
repo-
c
onfig: remove deprecated a
l
ias
f
or "g
i
t
config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
Documentatio
n
/Makefile: ma
k
e Ascii
D
oc
db
l
ate
x
dir configurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
merge-recursive:
fi
x
p
arsing of "d
i
ff-algorithm" op
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Jo
h
n Keep
i
n
g
reset: handle s
u
bmodule wi
t
h
tr
a
i
ling slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
o
hn Keeping
rm:
re-use parse
_
pathspec's
t
r
a
i
ling-slas
h
remo
v
al
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
Joh
n
Ke
e
p
ing
git_remote_h
e
lper
s
:
rem
o
ve
little used Python l
i
brar
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John K
e
eping
r
e
v-parse(1): logically
g
r
o
up options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John
Keeping
rev-parse
:
remov
e
restricti
o
ns on som
e
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Ke
e
ping
pull: change the
d
escription
t
o "i
n
tegrate" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
Keeping
push: av
o
id
suggesting "me
r
g
i
ng"
r
e
m
o
t
e ch
a
nges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
git-config(1): clarif
y
precedence of mul
t
i
p
le v
a
l
ues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John K
e
eping
git-co
n
f
i
g
: update doc
for
-
-get with multipl
e
values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
completion: learn a
b
out --man-p
a
th
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
completion: handle uns
t
uck form
of ba
s
e
git options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keep
i
ng
fast-imp
o
rt: allow movi
n
g the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-
i
mp
o
rt: allow ls o
r
filec
o
p
y
of the root
t
ree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
eeping
f
ast-im
p
ort: set
va
l
id mode on root tree i
n
"ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Joh
n
Keeping
t
9
300: document fast-impo
r
t e
m
pty path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
pi
n
g
submodule: drop t
h
e top-level requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
rev-p
a
rse: add --prefix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
s
u
bmodule
:
show full path in error message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
t7403: add miss
i
n
g
&&
c
hainin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
t7403: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t
7
401: make indent
a
tion consist
e
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keep
i
ng
mergetool--lib: refact
o
r
{dif
f
,
m
erge}_
c
md logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
Documentation/Makefile:
move infodir to
be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
D
ocumentation/Makefile: fix spaces
a
r
o
und assig
n
ments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keep
i
ng
add--interactive: r
e
spec
t
diff
.
alg
o
r
i
t
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Ke
e
p
ing
git-gui: fix file nam
e
h
a
ndling with non
-
e
mpty pr
e
fix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
J
oh
n
Keepin
g
fetch: don't try to upda
t
e unfetched tracking
re
f
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
Joh
n
Keeping
difftool:
fix
dir-diff when file doe
s
not
e
xist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
J
ohn Keeping
merge-
t
ree: handle di
r
ect
o
ry/empty conflict corre
c
tly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/Makefile: don't
define TEST_RE
S
ULTS_DIRE
C
TORY recurs
i
v
ely
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Kee
p
ing
contr
i
b/
s
u
btree: don'
t
de
l
ete remote branches
if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John
K
e
e
pin
g
test output: re
s
pect $TEST_
O
UTPUT_DIRECTO
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makef
i
l
e
: remove smo
k
e
t
e
st ta
r
gets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John K
e
eping
merge-tree: fi
x
typo in "both changed identically
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
Joh
n
Keeping
t/M
a
kefile: fix result handling with
T
EST_OUTPUT_DIR
E
CTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transpor
t
-hel
p
er:
a
d
d 'sig
n
ed-tags' capabili
t
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keeping
transport
-
helper: pass
-
-sign
e
d-tag
s
=warn-strip t
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Keep
i
ng
fas
t
-export:
add
-
-si
g
n
ed-tag
s
=war
n
-
stri
p
mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/
t
est-lib
.
sh: fi
x
TRASH_DIRECTO
R
Y h
a
ndling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
J
o
hn Keep
i
ng
merge-tree: don't pri
n
t ent
r
ies that match "l
o
c
a
l"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitre
m
ote-he
l
p
ers(1):
c
l
arify refspec beha
v
iour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
K
eeping
s
u
bmodule:
print graph
output next
t
o
s
ub
m
odule lo
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
diff: allow unst
u
ck
arg
u
me
n
ts
with --d
i
ff
-
algori
t
hm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eep
i
ng
gi
t
-merg
e
(
1
): documen
t
diff
-
a
l
g
ori
t
hm o
p
tion to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
K
e
e
ping
bisect: av
o
id sign
e
d i
n
teger overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn K
e
e
p
ing
di
f
fcore-break
:
don
'
t di
v
ide by
zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
K
ee
p
ing
t7800: run --d
i
r
-
d
iff
t
es
t
s
w
ith and with
o
ut symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t
7
8
00: fix te
s
ts whe
n
d
i
ff
t
ool uses --
n
o-sym
l
inks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keep
i
ng
t7800: don
'
t hide gre
p
out
p
u
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keepi
n
g
difftoo
l
: d
o
n
't overwri
t
e
mo
d
ified
files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: move
'--symlinks'
sp
e
c
i
fic test to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John
K
eeping
m
erg
e
-tree
:
fix
typo i
n
merge-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
J
o
h
n Keeping
refs
.
c
:
fix fread error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
e
n
t
r
y: fix filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
t2003: mode
r
nize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
K
e
eping
difftool -
-
dir-d
i
f
f
:
symlink all
f
ile
s
ma
t
c
hing the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
dif
f
tool: avoid dou
b
le slas
h
e
s in
symlink ta
r
gets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keep
i
ng
git-difftoo
l
(1): fix for
m
a
t
ti
n
g o
f
--symlink descriptio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
Joh
n
Keeping
Rev
e
rt
"
graph
.
c: ma
r
k pri
v
ate file-
s
cope s
y
mbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Makefil
e
: make mandir, htmldir
a
nd in
f
odir abso
l
u
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
re
b
ase
-
i
:
r
e
spec
t
c
o
re
.
commen
t
char
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
oh
n
Keeping
combine-
d
iff
.
c
: teach
comb
i
ned dif
f
s
abo
u
t
line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
e
e
p
ing
d
iff
.
c
: use d
i
ff
_
line_prefix()
w
he
r
e appl
i
cable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
d
iff: ad
d
diff_line_pref
i
x functi
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
diff
.
c: m
a
ke constant st
r
in
g
argu
m
en
t
s con
s
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
diff
:
write pre
f
ix to t
h
e correc
t
fil
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
o
hn Keepi
n
g
graph: output pad
d
ing for merge subsequen
t
p
a
ren
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
Jo
h
n Keeping
t40
3
8: 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
Keepi
n
g
built
i
n/apply: tighte
n
(dis)simi
l
arity index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Ke
e
ping
merg
e
t
o
ol--lib: li
s
t u
s
er configured tools
i
n '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John
K
eeping
Rename {git-
=>
git}remote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
oh
n
Kee
p
ing
CodingGuidelin
e
s: add
P
ython cod
i
ng guideline
s
commit
|
commitdiff
|
tree
2013-01-28
John
K
eeping
git-remote-
t
e
stpy: fix pa
t
h
ha
s
hing
on Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
mer
g
etool--li
b
: don't c
a
ll "exi
t
"
in
s
e
tup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
git-difftool: use g
i
t-me
r
getool--lib for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergetool: don't hardcode 'mergetool' in
s
how_to
o
l
_
h
elp
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-me
r
ge
t
o
ol: remove redu
n
dant
a
ssignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git-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 Keeping
git-remote
-
testpy:
call print as a fu
n
c
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
g
i
t
-remote-tes
t
py: don't do unbuf
f
ered te
x
t
I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
it-remote-testpy: hash bytes explicitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn
Keeping
svn-fe: allow svnrdu
m
p_sim
.
py to run with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keep
i
ng
git
_
remote_hel
p
ers: use 2to3 if bu
i
lding with
P
ython 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keep
i
ng
gi
t
_r
e
m
ote_h
e
l
pers: force rebuild if pytho
n
versio
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
J
o
hn Keeping
g
it-cvsimport
.
txt: cv
s
p
s
-2 is depr
e
cated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keeping
git-for-each-ref
.
txt: 'raw' is
a
supported
d
ate format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
ohn
Keeping
git_
r
e
mote_helpers: fix input when running under
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Ke
e
ping
git
_
remote_help
e
rs: all
o
w building with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John
K
e
e
ping
git-
s
vn: teach find-rev to find near matc
h
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fast-import(1): reorganise options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keepi
n
g
g
i
t-fa
s
t-i
m
port(1):
combine do
c
umenta
t
ion of --[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Ke
e
ping
git-sh
o
rtlog(1): docum
e
nt behaviour o
f
zero-width wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next