repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'mm/detach-at-HEAD-reflog' into maint
2015-09-10
John Keeping
Makefil
e
:
f
i
x MA
K
EFLAG
S
tests with multiple flags
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-03-31
John Kee
p
i
ng
strea
m
ing
.
c: fix a memlea
k
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John K
e
e
ping
compl
e
tion: complete `
g
it push --force-with-
l
ease=`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Keeping
comple
t
ion: add
s
o
me missin
g
opt
i
o
n
s
to `git pus
h
`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
Jo
h
n
Kee
p
in
g
completio
n
: c
o
mplete "unstuck
"
`
gi
t
pu
s
h -
-
recurse
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
John Keep
i
ng
r
e
base: omi
t
patch-identical
commits with --fo
r
k-p
o
int
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
J
o
hn
Keeping
rebase--am: use --c
h
erry-pick instead of --ignore-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keepi
n
g
completion: add missing options for git-me
r
ge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
completion: add a note that
me
r
g
e options are shared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
J
o
h
n
K
e
e
ping
bui
l
tin/mv: fix ou
t
of bo
u
nds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
o
h
n Kee
p
i
n
g
b
u
iltin/m
v
:
don't use
m
e
mo
r
y
a
fter free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf8: u
s
e correct ty
p
e
f
o
r values i
n
i
n
t
e
r
val table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John
K
eeping
utf8: fi
x
iconv error detection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keep
i
ng
notes
-
uti
l
s:
ha
n
d
le boolean notes
.
rew
r
itemode correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John Keeping
Mak
e
file
:
remove redundant object in git-http{f
e
tc
h
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John K
e
eping
pull: suppres
s
e
r
ro
r
when n
o
remoteref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
o
h
n
Keepin
g
completi
o
n: ha
n
dle
-
-[no-]fork-point o
p
tio
n
s to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
Jo
h
n Keeping
completion:
c
ompl
e
te me
r
ge-base options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keepin
g
rebase: fi
x
fork-poi
n
t
w
ith zero argume
n
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
rebase: use r
e
flog to fin
d
common base with upstrea
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keep
i
ng
pull:
u
se
m
e
r
ge
-
ba
s
e
--fork-point w
h
en appro
p
r
iate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Kee
p
ing
peek-
r
emote: re
m
ove d
e
precat
e
d alias
of ls-r
e
mote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Jo
h
n Keeping
lost-found: remove deprecated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keepi
n
g
tar-tree: remov
e
d
e
precat
e
d command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Jo
h
n Keeping
repo-con
f
ig:
r
e
mo
v
e deprecated alias for "git config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John
K
eeping
Doc
u
men
t
atio
n
/M
a
kefile: make
AsciiDoc dblatex dir
configurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keepin
g
m
erg
e
-recurs
i
ve: fix parsing of "diff-algorithm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
r
eset:
handle
submodu
l
e with
trailing s
l
ash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm: re-use
p
a
r
se_p
a
thsp
e
c's t
r
ailing-sla
s
h removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Keeping
git_r
e
mote
_
helpers: rem
o
v
e little use
d
Pytho
n
library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev
-
parse(1): logicall
y
group opti
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Kee
p
i
n
g
rev-parse: remove restrict
i
o
ns on so
m
e options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John K
e
eping
pull:
c
h
a
nge the description t
o
"integr
a
t
e
"
c
hanges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
p
u
sh: avoid suggesting
"
m
erging
"
remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
git-config(1): cla
r
i
f
y prec
e
d
e
nce of multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
git-con
f
ig: update doc for --ge
t
with m
u
ltiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Kee
p
in
g
completion: learn
ab
o
ut --man
-
path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
ohn Keeping
co
m
pleti
o
n: ha
n
dle unstuck for
m
of base
git options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn Keeping
fast-import:
allow mo
v
ing th
e
root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Joh
n
Keep
i
ng
f
a
st-import: allow
ls or filecopy o
f
t
h
e
root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast
-
i
m
port: set va
l
id mo
d
e on root tree in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
Keeping
t9300: do
c
u
m
en
t
fa
s
t-import empty path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
submodule: drop the
top-level re
q
uirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n
Kee
p
ing
rev
-
p
ars
e
: add --pr
e
fix op
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule: show full path
i
n error
message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t
7403:
add missing && chai
n
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keeping
t7403: modernize
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7401:
m
ake indentation c
o
nsistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
me
r
get
o
ol-
-
lib: refactor
{
diff,mer
g
e
}
_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Documentation/Ma
k
e
file: move infodir
to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Docume
n
tation/
M
ak
e
fil
e
: fix spa
c
es around assignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
J
o
hn Keepi
n
g
add--interactive: respect
diff
.
algor
i
thm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John K
e
eping
git-gui: fix
file
nam
e
handling with no
n
-em
p
ty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
J
ohn Keeping
fetch: don't try to upd
a
te
u
n
f
et
c
hed tracking
refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John
K
eepi
n
g
diff
t
ool:
f
i
x
dir-diff when file does
not exist i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-tre
e
: handle d
i
re
c
tory/empty conflict
c
orre
c
tly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/Makefile: don't
define TEST_RESULTS_DIRECTORY recu
r
siv
e
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
J
o
hn
K
eeping
c
o
ntr
i
b/subtree: don't de
l
ete remote branches i
f
sp
l
i
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
J
o
hn Keeping
test
o
utput: res
p
ect $TEST
_
OUTPUT_DIRECT
O
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefile
:
remove smoke te
s
t ta
r
ge
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merge-tr
e
e:
f
ix typ
o
i
n
"both chan
g
ed
i
de
n
tically
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
Jo
h
n
Keeping
t
/
Makefile: fix resu
l
t
h
andling w
i
th TEST_OUTPUT_DI
R
ECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
ping
t
ransp
o
rt-helper: add 'sign
e
d-tags'
capa
b
ility
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eeping
tr
a
nsport-helper: pass --s
i
gned-tags=war
n
-
s
trip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
ep
i
ng
fast-
e
xport: a
d
d --signed
-
tags=warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/test-lib
.
sh: fix TRASH_D
I
RECTORY
h
andling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
m
e
rge-tree: don't print e
n
tr
i
es that match "loca
l
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Ke
e
ping
gitrem
o
te
-
he
l
pers(1)
:
clarify refspec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keepin
g
submodule: pri
n
t graph output ne
x
t
t
o sub
m
odule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
Keeping
diff: allo
w
unst
u
ck argument
s
with --diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
gi
t
-merge
(
1): docu
m
ent diff-algorith
m
optio
n
to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keepin
g
bisect:
a
v
oid
s
igned integer over
f
low
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
dif
f
core-break: don'
t
divide by ze
r
o
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t
7
800: run --
d
i
r
-diff test
s
w
i
th an
d
without s
y
mlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
ing
t7800
:
fix te
s
ts when di
f
ftool uses
--no-symlin
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keeping
t78
0
0: don't hide grep
o
u
tput
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
difftool:
don't o
v
erwri
t
e modifie
d
files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: move '-
-
sy
m
link
s
' specific te
s
t to the
e
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John
K
eeping
merge-tre
e
: fix typ
o
in merge-tr
e
e
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
J
o
hn Keeping
refs
.
c: fix fread
er
r
or
handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
ping
entry: fix filter look
u
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
epin
g
t
2
003: m
o
de
r
niz
e
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Kee
p
ing
dif
f
tool --dir-diff:
sym
l
ink all files matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool: avoid dou
b
le
sl
a
sh
e
s in s
y
mlin
k
t
argets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
h
n
K
e
eping
git-difftool(1): fix
formatting of --symlink
de
s
cription
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John
K
eeping
Revert "graph
.
c:
m
ark private file-scop
e
s
y
mbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
o
hn Ke
e
ping
Makefil
e
: ma
k
e mandi
r
, htmldir
and i
n
fodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Ke
e
pin
g
reba
s
e -i: respe
c
t co
r
e
.
commentch
a
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
combin
e
-
diff
.
c:
t
each combi
n
ed diffs
abo
u
t l
i
ne prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Kee
p
ing
diff
.
c: us
e
diff_line_prefix() w
h
ere applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff:
a
dd diff_line_prefi
x
f
unction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keepi
n
g
diff
.
c:
m
ake constant stri
n
g
arguments co
n
st
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff:
w
r
i
te pre
f
ix to the correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Ke
e
ping
graph: out
p
ut padding for
merge
s
u
bsequent
p
arents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
ohn Keeping
t4038: add test
s
fo
r
"
diff --cc
-
-raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin/apply: tight
e
n (dis)simil
a
rity index parsi
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
mer
g
etool-
-
lib: list user confi
g
ured to
o
ls
i
n '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John
Keep
i
ng
R
e
n
ame {git
-
=>
git}remote-
h
e
lp
e
r
s
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
CodingGuidelines:
a
dd Python coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keep
i
ng
git-
r
e
m
o
t
e-te
s
tpy:
f
ix
path
h
a
s
h
ing on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next