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 'mb/relnotes-2.1'
2014-07-22
John Ke
e
p
i
ng
complet
i
on: compl
e
t
e `git push --
f
orce-with
-
lease=`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
J
ohn Keeping
comple
t
ion
:
add some mi
s
sing
o
p
t
ions to `g
i
t push
`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
J
o
hn Keep
i
ng
completion: complete "unstuck"
`git pu
s
h
--r
e
curs
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
J
ohn Keeping
rebase: omit patch-ide
n
tica
l
co
m
mit
s
with --
f
or
k
-p
o
in
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
John Ke
e
ping
rebas
e
--am: use --cherry-p
i
ck in
s
te
a
d of --
i
gnore-
i
f
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John K
e
e
p
ing
completion: add missin
g
options for git-merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
J
o
hn Keeping
c
ompleti
o
n: add a note that merge optio
n
s are sh
a
red
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
Joh
n
Ke
e
pin
g
builtin/mv: fix out o
f
bou
n
ds wri
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
built
i
n/m
v
: don't use me
m
ory after
free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John
K
e
eping
utf
8
:
use correct type for v
a
lues in in
t
erval tabl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
o
hn Keeping
utf8: fix iconv
error d
e
t
e
ction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Joh
n
K
e
e
p
in
g
notes
-
utils: handl
e
boole
a
n notes
.
rewri
t
emode correct
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John Keeping
Makefile: remov
e
re
d
undant o
b
ject
in git-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John Keepi
n
g
pull: suppre
s
s e
r
ror wh
e
n no remoteref is f
o
und
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
o
hn Keeping
completion:
h
andle --[no-]
f
ork-poin
t
op
t
ions to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
co
m
pletio
n
: complete mer
g
e
-
base options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keeping
rebas
e
:
f
ix fork-point wi
t
h zero arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Kee
p
i
n
g
rebase
:
use r
e
f
l
og to fi
n
d common base with
upstrea
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
J
ohn Keeping
pull: use mer
g
e-
b
ase --
f
or
k
-point when approp
r
iate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn
Keeping
pe
e
k-remote: re
m
ove dep
r
ecate
d
alias of ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
lost-
f
ou
n
d: rem
o
v
e
deprecated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
tar-tre
e
: remove
deprec
a
te
d
c
o
mmand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
r
e
po-config: rem
o
ve depr
e
cated alias for "git config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
Jo
h
n Keeping
D
o
cumentation/Makefile: make AsciiDoc dblatex dir conf
i
g
u
rable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John
Keeping
m
e
r
ge
-
re
c
ursiv
e
: fix parsing of "
d
iff-
a
lgo
r
ithm"
o
pti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John
Keeping
reset: h
a
ndle submodu
l
e w
i
th trailing slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm
:
r
e
-
use pars
e
_
p
athspec's trai
l
ing-slash removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Keeping
git_r
e
mote_helpers:
r
emove
l
ittle
u
sed Pyth
o
n
l
i
b
r
a
ry
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John
Keeping
re
v
-parse(1): logically group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-pa
r
se
:
remove restrictions on
some optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pull: change the description to "
i
ntegrate" cha
n
ges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
oh
n
Keeping
pu
s
h: avoid s
u
ggest
i
ng
"
merging" rem
o
te c
h
anges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
git-config(1)
:
clarify
p
recedence of multiple
v
alues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
J
o
hn Keeping
git
-
c
onfig
:
updat
e
doc fo
r
--ge
t
wi
t
h
m
ultiple val
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Joh
n
K
eeping
completion: learn abo
u
t --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Jo
h
n K
e
eping
c
o
mpletion: handl
e
uns
t
uck f
o
rm
of bas
e
git o
p
tions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Joh
n
Keeping
fast-impo
r
t
:
a
llow mo
v
in
g
the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n Keeping
f
a
s
t-i
m
p
ort: allow ls or file
c
opy
o
f the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Ke
e
pi
n
g
fast-import: se
t
valid mode o
n
root t
r
ee in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t
9
30
0
: document fa
s
t
-
import empty path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn K
e
eping
s
u
bmodule: dr
o
p the top-leve
l
requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n
K
e
e
ping
rev-parse: add --prefi
x
option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
e
ping
submodule: show full pa
t
h in error m
e
ssage
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
K
ee
p
ing
t7403: add m
i
ssing && ch
a
ining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t
7
403:
mo
d
ernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t
7
40
1
:
m
ake indentation consis
t
ent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keepi
n
g
mergetool--lib:
r
efactor {diff
,
merge}_
c
m
d logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keep
i
n
g
Documenta
t
io
n
/Makefile:
m
ove i
n
fodir to be wit
h
other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
Do
c
umentation/Makef
i
le: fi
x
s
paces around assi
g
nments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
add
-
-interact
i
ve
:
respect d
i
ff
.
algorith
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
J
o
h
n Keeping
git-gui: fix fil
e
na
m
e
handling with non
-
empty
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
Jo
h
n
Keep
i
ng
f
e
tch: don'
t
try to upd
a
t
e u
n
fetched tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John
K
eeping
d
ifftool: fix dir
-
d
i
f
f when fi
l
e does not e
x
ist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Kee
p
ing
merge-tree: ha
n
dle directory/
e
mpty
c
o
nfl
i
ct correc
t
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Ke
e
p
ing
t
/
Make
f
il
e
: don
'
t define
T
EST_RESULTS_DIRECTORY
r
ecur
s
ively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
Jo
h
n Keeping
con
t
rib/subtree:
don
'
t
de
l
ete remote branch
e
s if spl
i
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
Joh
n
Keeping
test
output: respect
$TEST_OUTPUT
_
DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
ohn
K
eeping
t/Makefile:
r
emove smoke test
tar
g
et
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keepin
g
merge-tree:
fix
typo in "both
c
hanged identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t/Make
f
i
le: fix r
e
sult han
d
ling with TE
S
T
_OU
T
P
UT
_
DIR
E
CTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Keeping
tran
s
port-helper: add 'sig
n
e
d
-t
a
gs' ca
p
ability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n Keepi
n
g
transport
-
helper: pas
s
--signed-tags=warn-s
t
r
ip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Ke
e
p
ing
fast-e
x
p
ort: add --
s
i
g
ned-tags=warn-s
t
rip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
h
n
Keeping
t/test-lib
.
s
h
: fix TRASH_DIR
E
CTORY
h
andlin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
J
ohn Ke
e
pi
n
g
merg
e
-tr
e
e: don't print entries
that match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Kee
p
ing
gi
t
remote
-
hel
p
ers(1): clari
f
y refs
p
e
c
b
eh
a
viour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn Keeping
submodul
e
: print graph output n
e
xt to submodule l
o
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John K
e
eping
diff:
a
llow unstuck arguments wi
t
h --di
f
f-algorit
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn
Keeping
g
i
t
-
merge(1): doc
u
ment diff-algorithm option to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
b
i
se
c
t: av
o
id
s
igned i
n
teger overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Ke
e
ping
d
i
ffc
o
re-brea
k
:
don't divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepi
n
g
t78
0
0: run
-
-dir-
d
iff
t
ests
with and
w
ithout symlin
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800
:
fix tests when difftool uses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keep
i
ng
t7800: don
'
t hide grep o
u
t
put
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keep
i
n
g
d
iffto
o
l: don't ov
e
rwrite
mo
d
ifi
e
d files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
e
eping
t
7
8
00: move '--symlinks
'
specific test to t
h
e
end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
merge
-
tree: fix typo in merg
e
-tree
.
c::unresol
v
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c: fix
fread error
handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
entry: fix filt
e
r looku
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keep
i
ng
t2003: modernize styl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
difftoo
l
--
d
ir-dif
f
: symlink all f
i
les match
i
ng the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
difftool: avoid
double slas
h
es in symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepin
g
git-difftool(1
)
:
f
ix for
m
atting of --
s
ymlink
descr
i
pt
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Revert "graph
.
c
:
mark private fil
e
-sc
o
pe
s
ymbo
l
s
as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John
Keepi
n
g
Ma
k
efile: make mandir, htmldir and infodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Ke
e
ping
rebase
-i: respect core
.
com
m
entchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n
K
e
eping
combine
-
diff
.
c: t
e
ach combined diffs about lin
e
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
diff
.
c:
use diff_
l
in
e
_prefix() wher
e
a
p
plicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
d
i
f
f
:
ad
d
d
iff
_
lin
e
_p
r
efix
function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
i
ff
.
c: make c
o
nstant stri
n
g arguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keep
i
ng
di
f
f: write prefix to t
h
e correct fil
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Ke
e
pin
g
graph: output padding for me
r
ge subsequent pa
r
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Ke
e
ping
t4038:
a
d
d tests for "
d
iff --cc --raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin
/
apply
:
tighten (dis)simila
r
i
ty
i
ndex parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
m
e
rg
e
tool--lib: list user configured tools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John
Keeping
Rename
{gi
t
- =>
g
it}remote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keepi
n
g
C
odingG
u
idelines:
add
Py
t
h
on coding gui
d
elines
commit
|
commitdiff
|
tree
2013-01-28
J
o
h
n
Keeping
g
i
t-
r
emote-t
e
stpy: fi
x
p
a
t
h
hashing
o
n Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keepi
n
g
mergetool--
l
ib:
d
on
'
t call
"
exit" in
s
etup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git-difftool: use git-merget
o
ol--lib for "--
t
ool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next