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 'jk/remote-pushremote-config-reading' into maint
2014-01-27
John Keeping
M
a
kefil
e
:
re
m
ove redundant object in git-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
J
ohn
K
eeping
pull: suppress er
r
or when no re
m
oteref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John
K
e
eping
c
o
mpletion: handle --[no-]fork
-
po
i
n
t
op
t
ions to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
ohn Kee
p
in
g
completion: com
p
lete me
r
ge-bas
e
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John K
e
ep
i
ng
rebase: fix fork-point w
i
th zero argument
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
rebase: use
r
efl
o
g to fi
n
d
c
ommo
n
b
a
se with upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
Joh
n
Keeping
pull
:
u
s
e merge
-
b
as
e
--fork-poi
n
t
when appropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
peek-re
m
ote: re
m
ove depr
e
cat
e
d
a
lias
of
l
s-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
K
eeping
lost-found: re
m
ove deprecated c
o
m
m
a
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Ke
e
ping
tar-tree: remove depre
c
ated
com
m
and
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
repo-config: remo
v
e deprecated alias for "git config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keepin
g
Documentati
o
n
/Ma
k
efile: make
Asci
i
Doc dblatex
d
i
r
configurabl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John
Keeping
mer
g
e-r
e
cu
r
sive: fix pa
r
si
n
g of "d
i
ff-algor
i
thm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John
Keepi
n
g
reset: handle subm
o
dule with
t
railing slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
r
m: re-use parse_pathspec's trailing-slash remo
v
al
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
J
o
h
n Keeping
g
i
t_remote_helper
s
: remove little
use
d
P
y
t
hon libr
a
ry
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Kee
p
ing
rev-p
a
rse(1): logically gro
u
p
o
ptions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Ke
e
ping
rev
-
par
s
e
: remove rest
r
ict
i
ons on some options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John
Kee
p
ing
pull: change th
e
description to
"in
t
egrate" chan
g
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keepin
g
push: avoid
s
u
ggest
i
ng "merging" r
e
mot
e
changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
ohn Keeping
git-c
o
nfig(1): clarify precede
n
c
e
of
m
ultiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
git-
c
onfig:
upd
a
te doc fo
r
-
-get with m
u
ltip
l
e valu
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
complet
i
on:
learn
a
bout --m
a
n-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keepi
n
g
comp
l
etion: h
a
nd
l
e unstuck form of
b
ase g
i
t options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Keeping
fast-
i
mpor
t
:
allow moving the
root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n K
e
epin
g
fast-impor
t
: al
l
ow ls or filecop
y
of the
root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
e
e
p
ing
fast-import: set val
i
d mode on root tree i
n
"ls
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
oh
n
Keepi
n
g
t9300: docu
m
en
t
fast-import
emp
t
y path
issu
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
e
eping
submodule
:
drop
the top-le
v
el
r
e
q
u
iremen
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
r
e
v
-parse: add -
-
prefix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodul
e
:
show full path in error me
s
sage
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
t74
0
3: ad
d
missing &&
c
haining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t74
0
3: modernize
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
oh
n
Kee
p
i
ng
t
7
401: ma
k
e in
d
e
n
tati
o
n
consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepin
g
m
erg
e
tool--lib:
r
efactor {
d
iff,merge}_cmd
lo
g
ic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepin
g
Do
c
umentati
o
n/Makef
i
le: move info
d
ir to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
Documentati
o
n/Makef
i
l
e
: fix
s
paces arou
n
d assig
n
ments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
a
dd--interactive:
r
e
spect
diff
.
alg
o
rithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
Joh
n
K
e
epin
g
g
i
t-
g
ui: fix fi
l
e name handling with
n
o
n-empty
p
r
efix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keepi
n
g
fetch: don't try to update
u
nfetched trackin
g
refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John
K
eepi
n
g
difftool: fi
x
dir-dif
f
wh
e
n file does
not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
Joh
n
Kee
p
ing
mer
g
e-tree:
h
andle directory/
e
m
p
t
y
c
onflic
t
correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/Mak
e
file:
don't defi
n
e TEST_RES
U
LTS_DIRECTORY recursiv
e
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
con
t
r
ib/sub
t
ree
:
don't delet
e
remote bra
n
ches
i
f
sp
l
i
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
J
o
hn Kee
p
ing
t
es
t
output:
r
e
s
p
e
ct $TEST_OUTPUT_DIREC
T
O
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makef
i
le: rem
o
ve smoke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn Keepi
n
g
m
e
rg
e
-tree: f
i
x t
y
po in
"both changed identi
c
a
lly"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
Joh
n
Kee
p
i
ng
t/Makefile: fix result
h
a
n
dlin
g
with
TEST_
O
U
TPUT_DIREC
T
O
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eeping
transport-helper
:
add 'si
g
ned-tag
s
'
cap
a
bility
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
ing
transport-helper: pass --sig
n
ed-tags=war
n
-stri
p
to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
epi
n
g
fast-e
x
port: add --s
i
g
ned
-
tags=war
n
-strip
mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eep
i
ng
t/te
s
t-
l
i
b
.
sh: fix TR
A
SH_DIRECTOR
Y
handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keep
i
ng
merge-
t
ree: don'
t
print entries
t
h
a
t
match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
Joh
n
Keeping
g
itremote-helpers
(
1):
clarify refspec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eeping
submodule: prin
t
graph output
next
to submo
d
ule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eeping
diff: allow unstuck argumen
t
s with --dif
f
-algorit
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n Keeping
git-merge(
1
): docume
n
t diff-algor
i
thm o
p
tion to
m
erge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bis
e
ct: avoi
d
signed in
t
eger overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Jo
h
n
Keeping
diffcore-b
r
eak: don't divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
h
n Keeping
t7800: ru
n
-
-
dir-diff
t
es
t
s with and without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: fix te
s
ts w
h
e
n d
i
fftool us
e
s --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keeping
t
7
8
00:
don't hide
gr
e
p
output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keeping
d
if
f
to
o
l: don't
over
w
rite modified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t
7800: move '-
-
symli
n
k
s
'
s
pecific
t
est
to t
h
e end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John
K
e
e
ping
me
r
g
e
-t
r
ee:
f
ix typo in merge
-
tre
e
.
c
::unreso
l
ved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c
:
f
i
x fread error ha
n
dling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
entr
y
:
f
ix filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
t
2003: moder
n
ize st
y
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
pin
g
dif
f
too
l
--d
i
r
-d
i
ff: sy
m
link all fil
e
s matc
h
ing the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keep
i
ng
difftool: avoid double slashes in symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keep
i
ng
gi
t
-d
i
ffto
o
l(
1
)
: fi
x
formatt
i
ng of --sym
l
ink descript
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John K
e
eping
R
e
v
ert "graph
.
c:
m
ark
private f
i
le-scop
e
symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John
Ke
e
ping
M
a
kefile: m
a
ke mandir, ht
m
ldir and infodir abso
l
ute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
e
eping
rebase
-
i: respect co
r
e
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
combine-diff
.
c: teach
c
ombined
d
if
f
s
a
bout l
i
ne
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Kee
p
ing
diff
.
c: use
d
i
ff_
l
in
e
_pre
f
i
x()
wh
e
re
applicab
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Kee
p
ing
diff:
add diff_line_prefix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eepin
g
diff
.
c
:
m
ake co
n
stant s
t
rin
g
arg
u
m
ents
c
on
s
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: write pref
i
x
to the co
r
r
ect
f
ile
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
graph: out
p
ut padd
i
ng for merge subsequent p
a
rents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t403
8
:
add tests for "diff --
c
c --raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Kee
p
ing
b
u
iltin/app
l
y: tighte
n
(di
s
)simil
a
r
i
t
y
i
nd
e
x
parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
merge
t
ool--lib: list
user configured to
o
ls
i
n
'--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
o
hn K
e
e
ping
R
e
name {g
i
t-
=
>
gi
t
}remote-help
e
rs
.
t
xt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John
Kee
p
ing
CodingGu
i
deline
s
: add Pyth
o
n
coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
John
K
e
eping
g
i
t-rem
o
te-te
s
tpy: fix
p
a
th
h
ashing
on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
J
o
hn Keeping
me
r
getoo
l
-
-
lib:
don't call "exit" in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-diffto
o
l: use git-
m
ergetool--lib 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-mer
g
eto
o
l
: don'
t
har
d
code 'merge
t
ool'
in sho
w
_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
i
n
g
gi
t
-mergetool: remove redu
n
dant
a
ssignme
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
g
it-mergetool: mov
e
show_tool
_
he
l
p
t
o
mergetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
e
p
ing
git-remo
t
e-tes
t
py: call prin
t
a
s
a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
g
i
t-remote-te
s
tpy
:
don't do unbuffer
e
d
text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git-remote-tes
t
p
y
: hash byte
s
ex
p
lici
t
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n Keeping
svn
-
fe:
a
ll
o
w sv
n
rdu
m
p_s
i
m
.
py to run with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
ee
p
i
ng
g
i
t_remote_helpers: use 2to3 i
f
b
uilding with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keepi
n
g
g
it_remote_helpers: force rebuild if python version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
Joh
n
Keepi
n
g
g
i
t-cvsi
m
port
.
t
xt:
c
vsps-2 is deprecat
e
d
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
suppor
t
ed da
t
e format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
Jo
h
n Keeping
git_remote_helpers: fix in
p
ut when runni
n
g under Pyth
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next