repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'bc/push-match-many-refs'
2013-07-08
J
o
hn
Keepi
n
g
pull
:
chan
g
e the
de
s
criptio
n
to "integrate" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
ohn
K
eeping
push: avoid
s
u
ggesting
"
merging" remot
e
c
h
anges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
K
eeping
git-config(1): c
l
arify pr
e
cedence of mul
t
i
ple va
l
ues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
git-config: updat
e
doc for
-
-get with multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John
Keepin
g
c
o
mpletio
n
: learn a
b
out --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Joh
n
Keepi
n
g
completi
o
n
: hand
l
e unstuck form of
base git options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
submodule: drop the top-level requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
rev-parse: a
d
d
--pre
f
ix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submo
d
ule: show full path
in error message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403: add
m
i
s
sing && chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
ng
t740
3
: m
o
derniz
e
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7
4
01: make indentation consist
e
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
oh
n
Keeping
me
r
getoo
l
--lib: refa
c
tor {diff,merge
}
_cmd
l
ogic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Documentati
o
n
/
M
a
kefile:
m
o
v
e
infodir t
o
be with othe
r
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
Documen
t
a
t
ion/Makefile: fix s
p
ac
e
s
a
ro
u
nd assig
n
ments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
a
d
d--interact
i
ve: respect
d
iff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
Joh
n
Keepin
g
git-gui
:
fix
f
i
le name
h
andlin
g
w
i
th
n
o
n-empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Kee
p
ing
fetch:
don't
t
ry
t
o update unf
e
tched t
r
acki
n
g refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
difftool: fi
x
dir-diff when fil
e
does not exist
in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
J
ohn Keeping
m
erge-tree: handle dire
c
tory/e
m
pty conflict c
o
rrectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t
/
Makef
i
le
:
d
on't
d
e
f
ine TEST_RES
U
L
TS_D
I
RECTORY
r
ecursiv
e
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
co
n
trib/subtr
e
e:
d
on't delete remote br
a
n
c
h
e
s
i
f s
p
lit
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John K
e
e
pin
g
test out
p
u
t
: res
p
ect
$TEST_OUTP
U
T_D
I
R
ECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn Keepin
g
t/Makefile:
r
emove sm
o
ke tes
t
ta
r
gets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Jo
h
n
K
eeping
merge-tree: fix typo
i
n "both cha
n
g
e
d id
e
ntically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t/Makefile: fix result
h
a
n
d
ling with TEST_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
ng
transp
o
rt-hel
p
er: add '
s
igne
d
-tag
s
' capabil
i
t
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transport-helper: pass
--sig
n
ed-tags=warn-st
r
ip
to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eeping
fast
-
export: add --signed
-
t
ags=warn-
s
trip m
o
d
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
/
tes
t
-lib
.
sh: fix TRASH_DIRECTOR
Y
ha
n
dling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-tree: don't print entries
that matc
h
"local
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
J
o
hn Keeping
gitre
m
ote-helpers(1): clarify re
f
spec behav
i
our
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn
Keeping
submodul
e
: prin
t
gr
a
p
h output next to submodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
di
f
f: a
l
low u
n
stuck
a
rg
u
me
n
ts with --diff
-
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
Kee
p
ing
g
i
t-merge(1):
do
c
ument d
i
ff-algorithm option to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Kee
p
in
g
bisect: avoid signed integer
overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
h
n Keeping
diffcore-break: don't divide by ze
r
o
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
t7800: run --
d
ir-diff tests with an
d
without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eepi
n
g
t7800: f
i
x
tests when diffto
o
l uses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n
K
eeping
t7800: don't hide g
r
ep out
p
ut
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keepin
g
di
f
ftool: don't
o
v
erwr
i
te modified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t780
0
: mo
v
e '
-
-symlinks' specific test
t
o the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Kee
p
ing
m
e
rge-tre
e
:
fix
t
ypo in
m
e
rge-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keepi
n
g
refs
.
c: fix fread
error h
a
n
dling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
ping
entry: fix
f
ilt
e
r lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2003: modernize styl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool --dir-diff: sy
m
link all files mat
c
hi
n
g the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
dif
f
t
o
ol: avoid
d
ouble s
l
ashe
s
in
s
ymlink ta
r
g
ets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
g
i
t-difftool(1):
fix
form
a
tting of -
-
symlink
d
escription
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Kee
p
ing
Revert
"
graph
.
c: mark private file-scope
symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keepi
n
g
Makefil
e
: make mandir, htmldir and infodir abs
o
lute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
r
e
base -i: respect core
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n
Keeping
com
b
ine-diff
.
c
: t
e
ach combined diff
s
abou
t
l
i
ne prefi
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
d
i
ff
.
c: use diff
_
l
i
ne_prefix() where
applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: add diff_line_p
r
efix funct
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
dif
f
.
c: m
a
ke
c
onstant string
a
rgume
n
t
s co
n
st
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
d
iff: write prefix
t
o the correct f
i
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
graph: output padding for m
e
r
g
e subs
e
qu
e
nt paren
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
ohn
Keeping
t4
0
38: a
d
d
tests for "di
f
f --cc --raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
hn Keeping
builtin/apply: tighte
n
(dis)s
i
milari
t
y
index pa
r
s
in
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
m
e
r
ge
t
o
o
l
-
-lib
:
l
ist user configured t
o
ols in '
-
-tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keepin
g
Rename {git- =>
git}remo
t
e-hel
p
ers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
C
o
d
in
g
Gu
i
delin
e
s:
a
dd Pyth
o
n coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-remote
-
t
estpy
:
fix path hashing on Py
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
Jo
h
n Keeping
m
erget
o
ol--lib:
don't c
a
ll "exit" in setup
_
tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git-d
i
f
f
t
ool
:
use git-mergetool--lib for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keep
i
ng
gi
t
-mergetool: don't
har
d
code 'mergetool' in s
h
ow_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-mergetool: remove
r
edun
d
ant assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
git-mergetool: move show_to
o
l
_
he
l
p to mergetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keep
i
n
g
git-remote-t
e
stpy: c
a
ll pri
n
t as a fu
n
ction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
gi
t
-remote-testpy: don't do unbuffered t
e
xt I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git-remote-
t
es
t
py: hash bytes explic
i
tl
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
svn-fe: allo
w
s
v
nrdump_
s
i
m
.
py to
r
u
n w
i
th Py
t
hon
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_remote_help
e
rs:
use 2to3 if building with Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn
K
eeping
git_remote_helpe
r
s:
force rebuild
if pyt
h
o
n version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Kee
p
ing
git-cvsimport
.
txt: cvsps-2
i
s deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John K
e
e
ping
git-for-each-ref
.
t
x
t: 'raw' is a
suppor
t
ed date fo
r
mat
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keepin
g
git_re
m
ote_helpers: fix
input when ru
n
ning under Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Kee
p
ing
git_remo
t
e
_h
e
lpers
:
allow build
i
ng
w
i
th Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keeping
git-svn:
teach find-rev to find near mat
c
hes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Ke
e
ping
git-fast-impor
t
(
1):
r
e
o
rgan
i
se
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
Jo
h
n Keeping
g
it-fas
t
-
i
mp
o
rt(1
)
: co
m
bin
e
docum
e
ntatio
n
o
f
--[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git
-
shortlog(1):
doc
u
m
e
nt behaviour of
z
ero-width wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keeping
g
it-fast-import
(
1): remove dupl
i
cate '--don
e
' op
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John Ke
e
ping
Docume
n
t
a
tion: don't link to example ma
i
l ad
d
re
s
ses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Kee
p
ing
rebase
-i con
t
inue:
don't skip c
o
m
mit
s
that on
l
y change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree