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
Sync with 1.8.5.5
2014-01-27
John Keeping
Makefile
:
r
e
move redundant object in
g
it-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
Joh
n
K
e
eping
pull: suppres
s
error
when n
o
remoteref
i
s found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
completion
:
h
andle --[no-
]
fork-point options
to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John
Keepin
g
completion
:
comp
l
ete merge-base
op
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
J
o
hn Keepi
n
g
rebase: f
i
x fork-point with
z
ero arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keepi
n
g
r
ebase
:
use reflog to fin
d
common
b
ase with upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
Jo
h
n
Keepi
n
g
p
u
ll: u
s
e merge-bas
e
-
-fork-po
i
nt when
appropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
p
eek-r
e
mote: remove de
p
recated a
l
i
a
s of
l
s-rem
o
te
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
los
t
-found: remove deprecated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
K
eeping
t
a
r-tree:
r
emove deprecat
e
d
command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn Keepin
g
repo-con
f
ig: r
e
move deprecated alia
s
f
or "git con
f
i
g
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
Documentation/
M
ak
e
file: make Asci
i
Doc dbla
t
ex
dir confi
g
urable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
Jo
h
n
Keeping
m
e
r
g
e-recursive: fix parsing of "diff-
a
lgorit
h
m"
o
ption
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
reset: handle
s
ubm
o
dule with trailing slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm: re-use parse_path
s
p
ec's t
r
ail
i
n
g
-
s
lash rem
o
val
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
J
o
hn Keeping
git_remote_helpers: rem
o
ve litt
l
e used
Python library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
o
hn Keeping
rev-pars
e
(1):
logically group opti
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keepi
n
g
rev-p
a
rs
e
: remove restrictions on some options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pull: change
the descr
i
ptio
n
to "i
n
tegrate" c
h
anges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Ke
e
ping
push:
a
v
o
id su
g
gesting "mer
g
ing"
re
m
ote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keepi
n
g
g
it-confi
g
(
1): cl
a
rify
p
recedenc
e
o
f multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
git-confi
g
: updat
e
doc
for --ge
t
w
i
th multiple valu
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
completion: learn about
--man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
o
hn Keeping
com
p
le
t
ion:
hand
l
e unstuck form of base git option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-imp
o
rt: allow moving th
e
root t
r
ee
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n K
e
eping
fast-
i
mport: a
l
l
o
w
l
s
o
r
f
ileco
p
y of th
e
ro
o
t
tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn
Kee
p
ing
fast-i
m
p
or
t
: set va
l
id m
o
de on root tree
i
n "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t9300:
d
o
c
ument
f
ast-impor
t
empt
y
pat
h
i
s
sues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n Ke
e
p
ing
submo
d
ule: drop
t
he t
o
p
-level requireme
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn
Kee
p
ing
rev-parse: add
--prefix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
K
e
eping
submod
u
l
e
:
show
f
u
l
l pa
t
h in er
r
or message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
t7403: add
missing && chaini
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
K
e
epin
g
t74
0
3:
m
o
d
ernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
t7401:
make indentat
i
on c
o
nsistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n
Keeping
me
r
g
e
t
o
ol--li
b
:
r
efactor {diff,merge}_cmd logi
c
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
K
e
eping
Do
c
umentation/Make
f
il
e
:
move info
d
i
r
t
o be
w
i
th
o
t
h
e
r
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
Do
c
umentati
o
n/Makefile: fix s
p
aces arou
n
d
a
ssignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
J
ohn Ke
e
p
i
ng
add--in
t
eractive: respec
t
diff
.
algorit
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
J
ohn Keepin
g
git-
g
ui
:
fix file name handling with non-empty
p
refix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John
Keeping
f
e
tch: d
o
n't
t
r
y
to upd
a
te unfe
t
ched tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
Jo
h
n
Keeping
difftool:
fix d
i
r-diff when file does not exi
s
t in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keepin
g
merge
-
tre
e
: handle directo
r
y/em
p
ty con
f
lic
t
correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/Makefile
:
don't define T
E
ST_R
E
S
ULTS_DIRECTORY r
e
cursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
contrib/subtree: don't
de
l
ete remote branches if
s
p
l
it
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Ke
e
ping
test outpu
t
: respect $TEST_OUTPUT_DIR
E
CTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John K
e
epin
g
t/Ma
k
e
f
i
le:
r
emove smoke
test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
m
erge-tree: fix typo in "both change
d
identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keep
i
ng
t/Makefile: fix
result handli
n
g
with TEST_OUTPU
T
_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Keeping
t
r
ansport-he
l
per: add 'signed-tags' capabil
i
ty
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transport-helper: pass
-
-signed-ta
g
s=warn-s
t
rip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast
-
exp
o
r
t: add
--
s
igned-t
a
gs=warn-strip mo
d
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
n
g
t
/test-lib
.
sh: fix T
R
ASH_
D
IRECTOR
Y
handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
J
ohn Keep
i
ng
merge
-
tr
e
e:
d
o
n
'
t
print entries
t
hat matc
h
"
l
ocal"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitre
m
ote-helpers(1): clarify refspec
behavi
o
ur
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keep
i
n
g
su
b
modul
e
: print graph ou
t
pu
t
next
t
o
s
ubmo
d
u
l
e lo
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn Keeping
d
iff
:
allow uns
t
u
ck
a
rgu
m
ent
s
with --di
f
f-al
g
or
i
thm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
git-merge(
1
): docume
n
t
d
i
f
f-al
g
orithm opt
i
on to me
r
g
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keepin
g
b
isect
:
a
v
oid signed in
t
e
g
er overfl
o
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Keeping
diffcore-
b
r
e
ak: don
'
t divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keep
i
n
g
t7800: run --dir-diff tests with and without symlin
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Ke
e
ping
t7800: fix tests w
h
en difftool
uses --no-
s
y
mlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
epi
n
g
t7
8
00: don't hide gr
e
p output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
diff
t
ool: do
n
't overwrite modified
file
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn
Kee
p
ing
t7800: m
o
ve '--
s
y
m
links' specific test to the
e
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John
K
eeping
mer
g
e-
t
ree
:
f
ix typo in merge-tree
.
c
::u
n
resolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c: fix fread error hand
l
in
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Keeping
en
t
ry: fix filt
e
r
looku
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
in
g
t2003: moder
n
ize
s
tyle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Keeping
di
f
ftool --d
i
r-diff: s
y
m
l
ink all fi
l
es matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n
K
ee
p
i
n
g
difftoo
l
: avoid d
o
u
ble sla
s
hes in sym
l
ink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
git-difftool
(
1): fix formatting
o
f
--symlink description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keep
i
ng
Revert
"
g
r
aph
.
c: m
a
rk p
r
ivate file-sc
o
pe
sym
b
ols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keep
i
ng
M
ak
e
file:
make
m
andir, htmldir an
d
infodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebase -i: respect core
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
co
m
bine-diff
.
c:
teach combined diffs
a
bout line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: use diff_line_pref
i
x() where appl
i
cab
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn
K
e
epin
g
diff: ad
d
di
f
f_line_
p
refix
func
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
e
eping
diff
.
c: make constant
str
i
ng
arguments
c
o
n
s
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n
Keeping
di
f
f:
w
rite prefix to t
h
e correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
graph: ou
t
put paddi
n
g for merge sub
s
e
quen
t
parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John
K
eeping
t4038:
a
dd test
s
fo
r
"
diff --cc -
-
r
aw
<trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
b
u
iltin/apply: tig
h
ten (dis)similarity index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
merg
e
tool--lib:
l
ist
user configure
d
tools in '--
t
ool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
o
h
n
Keeping
R
e
name {git- => git}
r
emote-help
e
rs
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
o
h
n Kee
p
ing
Co
d
ingGuidelines: add P
y
thon coding
g
u
i
delines
commit
|
commitdiff
|
tree
2013-01-28
J
ohn Keeping
git-remote-testpy: fi
x
pat
h
has
h
ing on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Kee
p
ing
m
e
r
getool--lib: do
n
't call "exit" in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
g
it-d
i
fftool
:
use git-merg
e
tool--lib for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergetool: don't hard
c
ode 'merge
t
ool' in show_
t
ool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn K
e
eping
git-mergetoo
l
: rem
o
ve re
d
undant assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-merg
e
t
ool:
m
ove show
_
too
l
_help to mergetool--li
b
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote
-
testpy: call print as a
f
unctio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
n
g
git-rem
o
te-tes
t
py: don't d
o
unbuf
f
ere
d
t
e
xt I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote
-
te
s
t
p
y:
h
a
s
h bytes explicitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
sv
n
-f
e
: allow svnrdump_sim
.
py t
o
run
with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn K
e
ep
i
ng
git_remote
_
hel
p
ers: use 2to3 if build
i
ng
w
ith Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
git_remote_
h
elpers: force
rebuild if python
v
e
rsion
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Kee
p
i
ng
git-cvsimport
.
txt: cv
s
p
s-2 is
deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keepi
n
g
git-for-each-
r
ef
.
txt: '
r
aw' is
a s
u
p
p
orte
d
d
at
e
format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John
K
eepi
n
g
git_remote_helpers
:
fix input when running under Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next