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/config-path-include-fix'
2014-01-27
J
ohn Keeping
M
akefile
:
remove
r
edundant obje
c
t in git-h
t
tp{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
J
ohn K
e
epin
g
pull: suppre
s
s er
r
or when
no
re
m
oteref is foun
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
ohn
Keep
i
ng
completion:
handle --
[
no-]fo
r
k-point options t
o
git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Kee
p
i
ng
c
o
m
pletion:
c
omplete
m
erge-base
o
p
t
i
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
J
ohn Keeping
rebase: f
i
x
for
k
-point w
i
t
h
z
e
ro ar
g
um
e
nts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John
Keeping
rebase: use re
f
log to
find common base with upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
Joh
n
Keeping
pull:
use
merge
-
bas
e
-
-fork
-
point
w
hen ap
p
ro
p
r
iate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keepi
n
g
peek-r
e
mo
t
e: remove dep
r
ecated
a
l
ias of
l
s-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Jo
h
n Keeping
lost-found
:
r
emo
v
e
d
eprec
a
ted comm
a
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
t
ar-
t
ree: remove d
e
precated comman
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keep
i
ng
rep
o
-config: remove de
p
recated
alia
s
f
or "gi
t
c
o
nf
i
g
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Ke
e
ping
Docu
m
entatio
n
/Makefil
e
:
make AsciiDoc dbl
a
t
e
x dir
c
onfi
g
urable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
Joh
n
K
e
e
ping
merge-rec
u
rsi
v
e: fix pars
i
ng of
"
diff-algorithm"
option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
reset:
h
andle
subm
o
dule
with trail
i
ng slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John
K
e
epi
n
g
r
m
:
re-use pars
e
_pathspec'
s
trailin
g
-slash re
m
oval
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
J
ohn Keeping
git_r
e
mo
t
e_helpers: r
e
move little used Python library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John
Keepi
n
g
rev
-
p
a
rse(1): logic
a
l
ly g
r
o
u
p options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
o
hn
Keeping
rev-parse: remove restrict
i
o
ns on some options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pull: change the description to "int
e
grate" chan
g
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Joh
n
Keeping
push: av
o
id suggesti
n
g "merging" remote
c
han
g
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Joh
n
Keeping
git-con
f
ig(1): clarify pr
e
cedence
o
f multiple va
l
ue
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 doc for --
g
et w
i
t
h
mult
i
ple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
completion:
l
earn about
--man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keepin
g
co
m
pletio
n
:
handle unst
u
ck form of base git opti
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Kee
p
ing
fast-import: allow moving the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-import: all
o
w
ls o
r
f
i
l
ecopy
of
t
he root tr
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
Keep
i
ng
fas
t
-import: set v
a
lid
m
o
de on ro
o
t tree in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keepin
g
t9
3
00: document fas
t
-import
e
mpty path i
s
sues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
submodule: dro
p
the top
-
l
e
vel
requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
rev-parse: add --p
r
e
fix op
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
n
g
submodule: sho
w
f
u
l
l
path i
n
e
rror message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
t74
0
3: add
missing && chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403: moderni
z
e
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
t7401: make indent
a
tion consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Ke
e
p
i
ng
m
erg
e
tool--lib: refacto
r
{
dif
f
,me
r
ge}_cmd lo
g
ic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepin
g
Documenta
t
ion
/
M
a
kefile: move infodir to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
Docum
e
n
t
atio
n
/Make
f
ile:
fix
s
paces around assignmen
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
Joh
n
Kee
p
i
n
g
add--interactive:
re
s
pect diff
.
a
l
gorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
J
ohn Keeping
git-gui
:
fi
x
file
n
a
me ha
n
dl
i
ng wit
h
non-empty pre
f
ix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
Jo
h
n Keepin
g
f
e
tch: don't try
t
o
u
pdate unfetc
h
ed tracki
n
g
re
f
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John K
e
epi
n
g
d
i
fftool: fix dir-dif
f
when fil
e
does not exi
s
t
i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keepi
n
g
me
r
ge-tree:
han
d
le direc
t
ory/empty conflict correct
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/Makefi
l
e: don't define
T
EST_RESU
L
TS_
D
IRECTOR
Y
recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John
Keeping
contrib/subtree:
don't
d
elete
remote
branches if spli
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
Joh
n
Keeping
t
e
st outp
u
t:
resp
e
ct $TES
T
_
OUTPU
T
_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/M
a
kefi
l
e: remove smoke test targe
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John
Keeping
merge-tree:
fix typ
o
in
"
both changed
iden
t
ically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t/Makefile: fix
r
esul
t
h
a
nd
l
i
n
g wit
h
TEST_OUTPUT_DIRE
C
TORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
eping
transport-helper: add 'sign
e
d-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transport-helpe
r
: pass --signed-tags=warn-st
r
ip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-exp
o
rt: add
-
-si
g
ned-tags=warn-
s
tri
p
mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
ping
t/test-
l
ib
.
sh: fix TRA
S
H_DIRECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
J
ohn Keeping
m
erge-tree: don'
t
p
ri
n
t entries that match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Ke
e
ping
gi
t
remot
e
-he
l
per
s
(1
)
: cla
r
ify refspec beha
v
iour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n
Keep
i
ng
su
b
mo
d
u
le: print g
r
aph out
p
ut next
t
o submod
u
l
e
log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn Keeping
diff: allow unstuck argument
s
wit
h
-
-
diff
-
algor
i
th
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn Keeping
git-merge
(
1): document diff-
a
lgorithm optio
n
to merg
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John K
e
epin
g
bisect: avoid s
i
g
ned integer overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
Keeping
diffcore-break: d
o
n't div
i
d
e by
zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: run
--dir-diff tests with and without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
epin
g
t
7
800: fix tests when difftool
uses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t7800: don
'
t
h
ide grep o
u
tput
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
difftool: don't overwr
i
te
m
odi
f
i
e
d files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eepi
n
g
t7
8
00: m
o
v
e
'--symlinks
'
specific te
s
t
to th
e
end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
ohn Kee
p
ing
merge-
t
re
e
: fix typo in m
e
rge-tr
e
e
.
c::unresolv
e
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John K
e
e
p
i
ng
refs
.
c
: fix
f
re
a
d error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
e
n
try:
fix filter l
o
okup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn
K
eeping
t2003: mo
d
ernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difft
o
ol --di
r
-diff: symlink a
l
l files matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
diffto
o
l: avoid double
s
lashes i
n
symlink targe
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
g
it-
d
i
fftool(1): fix forma
t
ting of --symlink
d
escription
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
Jo
h
n
Keepi
n
g
Revert
"graph
.
c: mark private file-scope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
Joh
n
Kee
p
ing
Makefile: make m
a
n
d
ir, ht
m
ldir
a
nd infodi
r
absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebase -i:
r
e
s
p
ect core
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
combine-diff
.
c: teach c
o
mbined di
f
fs
about line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: use diff_line_pr
e
f
i
x() where appl
i
c
a
ble
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: add d
i
ff_line
_
pr
e
fi
x
function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n
Kee
p
ing
d
i
f
f
.
c
: make constan
t
string argum
e
nts const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
K
eeping
dif
f
:
w
r
ite prefix to t
h
e cor
r
ect file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
ohn Keeping
graph: o
u
tpu
t
pad
d
ing for
merge sub
s
equ
e
nt parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
Joh
n
K
e
e
pi
n
g
t4038: add test
s
for "diff -
-
c
c
-
-
raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Joh
n
Keeping
bu
i
ltin/apply: tighten (dis)similarity index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Kee
p
i
n
g
mergetool--lib: list u
s
er
c
onfigu
r
ed tools
i
n '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John K
e
eping
Rename {git- =>
g
i
t
}rem
o
te-hel
p
ers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
C
odingGuidelines:
add Python codi
n
g
g
uidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keepi
n
g
git
-
remo
t
e-testpy:
fix p
a
th hashing on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John K
e
epi
n
g
mergetoo
l
-
-lib
:
do
n
't ca
l
l "
e
xit" in
s
e
t
u
p_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn K
e
eping
gi
t
-diffto
o
l: use git-mergetoo
l
--
l
ib f
o
r "--tool-he
l
p"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-me
r
ge
t
ool: don't h
a
rdcode 'mergetool' in sho
w
_to
o
l_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git-m
e
r
g
etool: rem
o
ve redu
n
dant assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-me
r
getool
:
move
s
how_to
o
l_help to mergetool--li
b
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-
r
emote
-
t
e
st
p
y: cal
l
pr
i
nt as a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
g
i
t-remo
t
e-testpy: don't
d
o
unbuf
f
ere
d
text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
git-rem
o
te-
t
estpy: h
a
s
h
bytes
explici
t
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
svn-fe: allow svnrdump_sim
.
p
y
to run with Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keepin
g
git_re
m
ote_helpers: use 2to3 if
bui
l
ding with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t_r
e
mote_helpers
:
force rebuil
d
i
f python v
e
rsion
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John K
e
eping
git-
c
v
s
im
p
ort
.
t
x
t: cvsps-2 is d
e
precate
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
J
ohn Keeping
git-
f
or-each-ref
.
txt:
'
raw' is a supported date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John K
e
epin
g
git_re
m
ote_help
e
rs: fix input when
running
under Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next