repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'gr/rebase-i-drop-warn' into maint
2015-09-25
Joh
n
Ke
e
pin
g
Do
c
umentati
o
n: fi
x
section header ma
r
k-up
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-10
John
K
eeping
M
a
k
e
file: fix MAKEFLAGS tests with
multiple f
l
a
g
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-03-31
J
o
hn
K
eeping
str
e
aming
.
c: fix a memleak
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
J
ohn Keepin
g
completion: complete `git push --force-with-lease=`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
Joh
n
Kee
p
ing
co
m
pleti
o
n: a
d
d some m
i
ssing o
p
tions to `git push`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Keeping
completion: complet
e
"unstuck" `git push --re
c
urse
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
John Keepi
n
g
reb
a
s
e
: omit patch-i
d
entical commits
w
ith --fork-po
i
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
John Keep
i
n
g
re
b
ase--am:
u
se --cherry-pick in
s
tead o
f
-
-igno
r
e-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
J
o
hn Keeping
co
m
pletion: ad
d
missing options
for
g
it-merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keep
i
ng
compl
e
tio
n
:
add
a
n
o
te that
merge options are s
h
ared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
Joh
n
Kee
p
ing
builtin/mv: fix o
u
t of bounds
write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John
K
eeping
b
u
iltin/mv: do
n
'
t use memor
y
after free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Joh
n
Keeping
u
t
f
8: use co
r
rect type fo
r
v
a
l
u
e
s
in interval tabl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Joh
n
Keeping
u
t
f8: fix
i
co
n
v error detection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
o
h
n
Keeping
notes
-
utils:
handle b
o
olean notes
.
rewritemode cor
r
ect
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John Keeping
M
akefile: remove
r
edundant obje
c
t in git-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John Kee
p
i
ng
pull: su
p
press err
o
r
when no remo
t
eref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
oh
n
Keeping
c
ompletion: handle -
-
[no-]fork
-
point
o
p
tions to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John
Keeping
completion: compl
e
te
m
e
rge-base opti
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John K
e
epi
n
g
re
b
ase: fix
fork-point with zero arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
rebase: use
r
eflog to find commo
n
base with upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
J
o
hn Keep
i
ng
pull:
use
merge-base --fork-po
i
nt when appropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
K
e
eping
peek-remote: remove de
p
reca
t
ed
ali
a
s of ls-remo
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Keeping
lost-found: re
m
o
ve dep
r
ecated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keepi
n
g
tar-tree: rem
o
ve dep
r
ecated
c
omma
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
r
epo
-
c
onfig:
remove depreca
t
ed alias for "gi
t
confi
g
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Ke
e
ping
Documentation/Makef
i
le
:
make AsciiDo
c
d
b
l
atex dir configu
r
able
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
Joh
n
Keeping
merge-r
e
cursive
:
fi
x
pa
r
sing of "diff
-
algorithm" optio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
reset: handle submo
d
ule wit
h
tra
i
ling slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm: re-u
s
e parse_
p
ath
s
pec
'
s
t
railing-sl
a
sh removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John
Kee
p
i
ng
git_
r
emote_helpers
:
remove little used Pyth
o
n
l
ibrary
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keep
i
n
g
rev-parse(
1
): log
i
cally gr
o
up
o
ptio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
re
v
-
parse:
remove restrictions o
n
some op
t
i
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John K
e
eping
p
ull
:
change the description t
o
"integrate"
c
hanges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Joh
n
Keeping
push: avoid sugg
e
sting "me
r
ging" remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
Keeping
git-con
f
ig(1):
c
lari
f
y
precedence of m
u
ltiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keepin
g
git-config: update do
c
f
o
r --
g
et with mul
t
i
p
le values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Jo
h
n Ke
e
ping
completion: learn about --
m
an-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
ohn Keeping
completion: handle un
s
tuc
k
form o
f
b
ase git opti
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
h
n Keeping
fast-impo
r
t: allow mo
v
ing the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-import: allow ls o
r
filecop
y
of the
root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
eepi
n
g
fast
-
i
mport: set valid mode on root tr
e
e in "
l
s
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n K
e
eping
t9300
:
d
o
cu
m
ent fast
-
i
mport e
m
pty p
a
th issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submo
d
ule: drop the top-level requi
r
emen
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
rev-parse
:
a
d
d
-
-prefix opti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Kee
p
ing
su
b
module: show f
u
ll path in
error
message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
pin
g
t7403: add missing
&
& cha
i
ni
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
t74
0
3:
modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Ke
e
ping
t7
4
01: m
a
ke indentation consisten
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
mergetool--l
i
b: refactor
{
diff,merge
}
_cmd logi
c
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keeping
Docume
n
tation/Makefile: move i
n
fodi
r
to
be with
other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn K
e
ep
i
n
g
Doc
u
m
e
ntati
o
n/Makef
i
le: fix spaces around assignme
n
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John K
e
eping
add--int
e
ractive: respect
diff
.
algo
r
ithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keepi
n
g
g
i
t-gui: fix file name handling wit
h
non-empty p
r
efi
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keepi
n
g
fetch:
don
'
t try
t
o update
u
nfetched tracking
r
e
f
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
difftool
:
fix dir-diff when
f
ile does not exi
s
t in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
Jo
h
n
K
e
e
p
i
ng
merg
e
-tree
:
handl
e
directory/empty
c
onflict corr
e
c
tly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keep
i
ng
t/Makefile: don'
t
define
T
E
ST_RESULT
S
_DIRECTORY recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
J
ohn Ke
e
ping
c
o
ntrib/
s
ubtree:
don't de
l
ete remo
t
e
branches if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
J
o
hn Keeping
test outp
u
t: resp
e
ct
$TEST_
O
U
T
P
U
T
_DI
R
ECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Ma
k
efile:
r
emove smoke test tar
g
ets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
ohn
K
eeping
merge-tr
e
e: fix ty
p
o in "both chan
g
ed id
e
ntically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
J
oh
n
Keepin
g
t/M
a
kefile:
fix result handling with TEST_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n Keeping
transport-helper: add 'sign
e
d-t
a
gs' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
Keeping
tr
a
nsport-helper: pass --signed-
t
ags=warn
-
s
t
rip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keep
i
ng
f
ast-e
x
po
r
t:
ad
d
--signed-
t
ags=warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/t
e
st-lib
.
sh: fi
x
TR
A
SH
_
DIRECTO
R
Y h
a
ndling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keepi
n
g
merge
-
t
r
e
e
: don
'
t print
e
ntries that match "lo
c
a
l
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
J
o
hn Kee
p
i
n
g
gitremote-he
l
pers(1): c
l
arify refspec
b
ehav
i
our
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John K
e
eping
submodul
e
:
print
g
raph output nex
t
to submodule
log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Kee
p
in
g
diff: allow unstuck arguments
with --diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keep
i
n
g
git-merge(
1
): document diff-al
g
o
r
ithm opt
i
on
to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Jo
h
n Keeping
bisect: avo
i
d si
g
ned intege
r
o
verf
l
o
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
diffcore-break: don't
d
i
vide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7
8
00: run
--dir-diff tests with and without sy
m
links
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
t
7
80
0
:
f
ix test
s
when di
f
ftoo
l
uses
--no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t78
0
0:
d
o
n
't hide
g
rep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
d
i
f
ftool: d
o
n't over
w
r
i
te m
o
dified
f
il
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keeping
t7800: move '--symlinks' spe
c
if
i
c test to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
merge-tree: fix typo in merge-tree
.
c::unresolv
e
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John
K
eepi
n
g
re
f
s
.
c: fix fread
er
r
or
h
andling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
entry: fi
x
f
i
lter
lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2003:
modernize sty
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
d
i
f
ftool --di
r
-di
f
f: s
y
mlink all fi
l
es matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool: a
v
oi
d
double slashes in s
y
mlink targe
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
K
eeping
g
i
t
-difftool(1): fix formatting of --sym
l
ink descri
p
t
i
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John
K
eep
i
ng
Revert "graph
.
c: mark priv
a
t
e file-scope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
o
hn Ke
e
p
i
ng
M
akefi
l
e
:
make
m
andir,
htmldir
a
n
d infodir absol
u
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
rebase -i: resp
e
ct
c
ore
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
combine-
d
iff
.
c
: teach combined diff
s
about line prefi
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: u
s
e diff_lin
e
_prefix() wh
e
r
e a
p
plicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
d
iff:
a
dd dif
f
_
line_
p
refix funct
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
diff
.
c: m
a
ke constant string arguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
diff:
write
p
r
efi
x
t
o the correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John K
e
epi
n
g
graph: output
p
a
dding for merge s
u
bsequent p
a
rents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
ohn Keeping
t4038: add tests for "diff --c
c
--
r
aw <t
r
ees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n
Keepi
n
g
builtin
/
apply:
ti
g
h
t
e
n
(
d
is
)
simi
l
a
r
ity index parsi
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
mergetool--li
b
:
lis
t
use
r
c
onfigured too
l
s i
n
'
--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
ohn Keepi
n
g
Rename {git- =>
g
it}remot
e
-helper
s
.
tx
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
Codi
n
gG
u
idelines
:
add
P
yth
o
n coding guid
e
lines
commit
|
commitdiff
|
tree
next