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/rerere-conflict-style' into maint
2014-05-27
John
K
e
epin
g
co
m
pletion
:
add missing op
t
ions for
g
i
t
-m
e
rg
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
Jo
h
n Keeping
com
p
letion: add
a
n
o
te th
a
t
m
erge
o
ption
s
are sha
r
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
J
ohn Ke
e
ping
b
u
i
ltin/m
v
: fix out of bounds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Joh
n
Keeping
builtin/mv: do
n
't use
memory
af
t
er f
r
ee
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf
8
: use correct type fo
r
v
a
lu
e
s in
interval table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keep
i
n
g
ut
f
8:
f
ix iconv er
r
or
detection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Ke
e
ping
notes-utils:
handle boolea
n
not
e
s
.
rewritemode
c
or
r
ectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John Keeping
Makefile: remove redundant o
b
ject in git-http{f
e
tch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John
Keeping
p
ull: suppre
s
s error w
h
en no
r
emote
r
ef is f
o
u
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John K
e
eping
completion: handl
e
--[no-]fork-poin
t
options to gi
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
o
h
n
Ke
e
ping
com
p
l
e
tion: c
o
mplete m
e
r
g
e-base
o
ptions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Ke
e
pi
n
g
rebase: fi
x
fork-point with zero arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John
K
eeping
rebase:
u
se reflog to find
c
omm
o
n base
with u
p
strea
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
J
o
hn
Keeping
pull: u
s
e merge-base
-
-
fork-point when ap
p
ropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Kee
p
ing
peek-rem
o
te:
re
m
ove deprecated al
i
as of ls-re
m
ote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn
K
eeping
los
t
-f
o
un
d
: remove dep
r
e
cate
d
c
o
mmand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Jo
h
n
Keeping
tar-t
r
e
e: re
m
o
v
e deprec
a
ted command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
rep
o
-co
n
fig: remove deprecated alia
s
for "git c
o
n
fi
g
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John
K
e
eping
Documentation/Makefile:
make AsciiDoc dblatex dir configurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keepi
n
g
merg
e
-
r
ecursive: fix parsing
o
f "diff-al
g
orithm"
o
ption
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
reset:
h
andle submodule wi
t
h
trai
l
ing
slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Jo
h
n Keeping
rm:
r
e-use
p
a
rse_pathspec's
t
raili
n
g-
s
lash removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Keeping
git_remo
t
e_he
l
pers: remove little use
d
Python l
i
brary
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John K
e
eping
rev
-
parse(1): logically group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev
-
parse: r
e
move
r
es
t
r
i
ctions on some
o
ptio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pu
l
l: change the descriptio
n
to "in
t
e
grate" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
o
hn Keeping
push: avo
i
d sug
g
e
s
t
ing "merg
i
ng
"
remote change
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
git-co
n
fi
g
(
1
): clarify pr
e
cedence of
m
ultip
l
e values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keep
i
ng
g
i
t
-config: update doc for
--ge
t
wit
h
multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John
Keeping
c
o
m
p
le
t
ion: learn about --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
c
ompl
e
tion: handle unstu
c
k for
m
of
b
ase git options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keepin
g
fast-import: allow moving
the root tr
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
f
ast-im
p
ort: allow ls
o
r
filecopy of the root
tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Kee
p
ing
fast
-
import:
s
et valid
mode on root tree in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn
Keeping
t93
0
0: docume
n
t fast-import e
m
pty p
a
th issu
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n
K
eeping
submodule: d
r
o
p the top-le
v
e
l
requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
rev
-
parse: add -
-
prefix
option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
s
ub
m
odule: show full path in erro
r
mes
s
age
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n
K
eep
i
ng
t7403: add missing &&
chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
t7403: modernize
s
t
yle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keep
i
ng
t7
4
01:
m
a
k
e inde
n
tation
consi
s
tent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
mergetoo
l
--lib: refact
o
r {diff,merge}_cmd lo
g
i
c
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Kee
p
ing
Documentation/M
a
kefi
l
e: move in
f
odir to
b
e with oth
e
r
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
Documentatio
n
/Makefile:
fix spaces around assi
g
nments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
ad
d
--interactive: r
e
spe
c
t diff
.
algori
t
hm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keeping
git-
g
ui: fix
file name h
a
ndling with
n
on-empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
fetch: don't tr
y
t
o
u
pdate unf
e
tched
tracking ref
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
J
ohn
K
e
eping
difftool: fix dir-diff when file do
e
s not e
x
i
st
in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
J
ohn Ke
e
p
ing
merge-tre
e
: handle dire
c
tory/empty
c
o
n
flict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
Joh
n
Keepi
n
g
t/Makefile: don'
t
define TEST_RES
U
LT
S
_DIRECTORY recursivel
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
J
o
h
n Keepin
g
contrib/s
u
btree:
d
on't delete
r
emote branches if
s
p
l
i
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test output: respect
$TEST_O
U
TPUT
_
DI
R
EC
T
ORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
h
n Keepin
g
t/Make
f
ile: remove smok
e
test targe
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John K
e
epin
g
merg
e
-tree: fix typo in
"
both changed identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Ke
e
p
ing
t/
M
akefile: fix result
h
and
l
ing wit
h
TEST_
O
U
TPUT_
D
IRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n Keeping
transport-helper: add 'signed
-
tags' capab
i
lity
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepi
n
g
transport-helper: p
a
ss --signed-tags=w
a
rn-s
t
rip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Kee
p
ing
fast-ex
p
ort
:
a
dd --signed-tags=warn-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: fix TRA
S
H_DIRECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
Joh
n
Keep
i
ng
merg
e
-tree:
don't print e
n
tries that mat
c
h
"
loca
l
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Kee
p
ing
gi
t
re
m
o
te-helpers(1): clarify refspec b
e
haviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
Keep
i
ng
su
b
modu
l
e: p
r
int graph output next to submod
u
le l
o
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
diff: allow uns
t
uck
argu
m
ents w
i
th
--diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
K
e
epi
n
g
g
it-merge(1): docu
m
ent
d
i
f
f
-
algorithm op
t
ion to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisect
:
avoid signed i
n
teger
o
verflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Ke
e
p
ing
d
i
f
fcor
e
-br
e
a
k
: do
n
't d
i
vide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: run --dir-
d
iff t
e
sts wit
h
a
n
d without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t7800: fix te
s
ts when difftool
u
ses --no-symlink
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keep
i
ng
t7800: don't hi
d
e
grep out
p
ut
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Keeping
difftool: d
o
n't overwrite
m
odified fi
l
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Keeping
t
7
800: m
o
v
e
'--symlin
k
s'
spe
c
ific te
s
t to
the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
merg
e
-tree: f
i
x
typ
o
in merge-t
r
ee
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
J
o
hn Keeping
re
f
s
.
c
:
fix frea
d
error
hand
l
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entry: fix filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t200
3
: m
o
der
n
ize s
t
yle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Ke
e
pi
n
g
difftool --dir-diff: symlink a
l
l files m
a
tch
i
ng the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
h
n Ke
e
ping
difftool
:
avo
i
d
d
o
u
b
l
e sl
a
shes in symlink
target
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Keeping
git-difftool(1)
:
fix forma
t
ting of --symlink
desc
r
iption
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keep
i
n
g
R
ev
e
r
t "graph
.
c:
m
ark privat
e
file-sc
o
pe
s
y
m
bols
as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Mak
e
file: ma
k
e mandir, htmldir
a
nd i
n
f
o
dir absolu
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebase -i: resp
e
ct
c
ore
.
co
m
men
t
cha
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
c
o
mbine
-
diff
.
c: t
e
ach combined diffs about li
n
e prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn K
e
ep
i
ng
di
f
f
.
c
:
use
d
i
ff_line_prefi
x
() where applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
di
f
f: add d
i
ff_lin
e
_
prefix fu
n
ction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
d
iff
.
c
:
make con
s
t
a
nt string argum
e
n
ts c
o
nst
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
K
e
eping
d
i
f
f:
w
rite p
r
e
fix to
t
he correct fi
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keep
i
n
g
g
ra
p
h: output pad
d
ing for m
e
rge subsequent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John K
e
e
ping
t
40
3
8:
a
dd
t
e
s
ts for
"diff --cc --r
a
w
<
trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Kee
p
ing
builtin/a
p
ply: tighten (di
s
)similarit
y
inde
x
parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
mergetool
-
-
l
ib: list use
r
configured tool
s
i
n
'
--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
oh
n
Keeping
Rename {git- => git}remote-he
l
pers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John
Keepi
n
g
CodingGuidelines: add P
y
t
h
on cod
i
ng guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-remot
e
-testpy
:
fix path
hash
i
ng o
n
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John
Keepin
g
merg
e
tool--lib
:
d
o
n't call "exit" in setup_
t
o
o
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
git-difftool: use
g
it-mergetoo
l
--lib for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t-mergetool: don't h
a
rdcode 'mergetool' in sho
w
_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-m
e
rgetool: remove re
d
u
n
dant
ass
i
gnment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
g
it-mergetool: mo
v
e show_t
o
ol_help
to mergetoo
l
--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git-remote
-
testpy:
call
pr
i
nt as a
f
un
c
t
i
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
g
i
t-remote-testpy: don't do unb
u
ff
e
red
t
ext I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next