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
Git 1.9-rc1
2014-01-27
Jo
h
n Keep
i
ng
Makefile: re
m
o
v
e
redundant object in git-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John K
e
e
p
ing
pull:
suppress error w
h
en no remoter
e
f is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
oh
n
Keepi
n
g
completion: han
d
le --[no-
]
fork-point opti
o
ns to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John K
e
eping
comp
l
etion: c
o
mplete
m
erge-ba
s
e options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
J
o
h
n
K
eep
i
n
g
rebase: fix fork-point with
z
ero
arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keep
i
ng
rebase: use reflo
g
to find
c
ommon bas
e
wi
t
h ups
t
re
a
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keeping
p
u
ll:
u
se
m
e
r
ge-bas
e
--fork-point when appropria
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
pee
k
-
r
emote: remove d
e
prec
a
ted alias of l
s
-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
K
eeping
lost-found: r
e
m
ove depr
e
cated
command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
K
e
e
p
ing
t
a
r-tre
e
:
remove
depr
e
cat
e
d command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John K
e
eping
repo
-
config:
r
e
move
de
p
reca
t
ed alias for "git con
f
ig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
Documen
t
atio
n
/M
a
k
e
file:
m
a
ke As
c
iiDoc dblatex dir configurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
merge-rec
u
rsive: fix parsing o
f
"diff-algorithm" opti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keepi
n
g
reset: h
a
n
dle
s
ubmodule with t
r
ailing slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm
:
re-u
s
e p
a
r
s
e_pathspec's trailing-
s
lash removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
n Keepin
g
git_remote_helpers: remove
litt
l
e
used Pyt
h
on
l
ibra
r
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-parse
(
1): logically group o
p
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
o
h
n
Keeping
rev-
p
arse: remove restriction
s
o
n
s
om
e
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Kee
p
in
g
pull: change
t
he de
s
cr
i
pti
o
n to "in
t
e
grate" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John K
e
e
p
ing
push: avoid suggesting "merging"
r
e
m
ot
e
c
h
anges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
git-config(1): clarify precedence of mult
i
p
l
e values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
Jo
h
n Keepi
n
g
git-conf
i
g: update doc for --get with multipl
e
v
alues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Joh
n
K
eep
i
ng
completion
:
learn about --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Ke
e
ping
com
p
letion:
handle
unstuck form of base git options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John K
e
epin
g
fast-import
:
allo
w
movin
g
the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Keeping
fast-import: allow ls or filecopy of the root
tr
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn
Keeping
fast-
i
mport:
set valid mode on root tree in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
Keeping
t
9300: document fast-imp
o
rt e
m
pt
y
p
a
th is
s
ues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
sub
m
odule:
drop the top-l
e
vel requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n
Keeping
r
ev-parse:
ad
d
--p
r
e
f
ix optio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submod
u
le: sh
o
w full p
a
th in error message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eepin
g
t
740
3
: add missing && chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t
7
40
3
: modernize sty
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t
7401:
mak
e
indentation consis
t
ent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
me
r
getool
-
-lib: refactor {diff,mer
g
e}
_
c
m
d lo
g
ic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
Documen
t
ation/Makefile: move infodir
t
o be wit
h
other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keeping
Documentation/Makefile: fix
s
paces ar
o
und assign
m
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
add
-
-interactive: respect
d
iff
.
a
lgorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keeping
git
-
gui: fix file na
m
e
h
andling
w
ith non-empty p
r
efix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keepi
n
g
fet
c
h: don't try to update u
n
fetched
t
r
acking r
e
fs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
Joh
n
Keepin
g
difftool
:
fix
d
ir-diff when
file d
o
es not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John
Keep
i
ng
m
e
rg
e
-tree: handle
dire
c
tory/e
m
pty c
o
nflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keepin
g
t/Makefile: don't
def
i
ne TEST_RESULTS_DIRECTORY recursive
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John
Kee
p
ing
contrib
/
subtree: d
o
n't delete remote
branc
h
es if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
t
e
s
t
o
utput: respect $TEST_OUT
P
UT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefile:
remove smoke
t
est targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
ohn K
e
eping
m
e
r
g
e
-
t
r
ee:
f
ix typo in "both chang
e
d i
d
entically
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t/Make
f
ile: f
i
x resul
t
h
andling
with TEST_OUTPUT_
D
IRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepi
n
g
transport-helper: a
d
d 'signed-tags' capabili
t
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
ing
t
ransport-helpe
r
: p
a
ss --signed
-
tags=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn
K
e
eping
fast-export:
a
dd --signed
-
tags=w
a
r
n
-
strip mod
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/test-
l
ib
.
sh
:
fix
TRASH_DIR
E
CTORY h
a
ndling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
m
erge-tree: don't
p
rin
t
ent
r
ies that
m
atch "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
Jo
h
n Kee
p
ing
gitremote-helpers(1): clarify ref
s
pec b
e
havi
o
ur
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
Keeping
submodule:
print g
r
aph
o
utput next to subm
o
d
u
l
e
lo
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
diff: allow unstu
c
k ar
g
ume
n
ts with --dif
f
-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
e
ep
i
ng
git-merge(1): document diff-algorithm option to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Ke
e
ping
bisect: a
v
oi
d
sign
e
d i
n
te
g
er overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John K
e
e
ping
diffcore-break: do
n
't divide by
z
ero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: r
u
n
-
-d
i
r-diff
t
ests w
i
th
an
d
without symli
n
ks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: f
i
x tests when difftool
u
s
e
s
--no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: don't hide
g
rep outpu
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
difftool: don't overwrite modified
files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t
7800:
move '-
-
sy
m
links' speci
f
ic
tes
t
to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
merge-tree: fi
x
typo i
n
merge-tree
.
c::unresolv
e
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John
K
eeping
refs
.
c
:
fix
fread error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entry:
f
i
x f
i
lter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2
0
03: mode
r
n
ize
s
tyle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
diff
t
o
ol --dir
-
diff: symlink
all
f
iles ma
t
ching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
di
f
f
t
ool: av
o
id do
u
ble
slashes in sy
m
link targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Ke
e
ping
git-difftool(1): fix formattin
g
of --s
y
mlin
k
description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Ke
e
ping
R
e
vert
"graph
.
c
: mark pr
i
vate fi
l
e
-sco
p
e symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John K
e
epin
g
Makefile: make mandi
r
, htmldi
r
and infodir
a
bsolu
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
re
b
a
s
e -i: resp
e
ct core
.
commen
t
char
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
n
g
c
o
m
bine-diff
.
c: t
e
ach c
o
mbine
d
diff
s
about line
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Kee
p
i
ng
diff
.
c: u
s
e diff_
l
ine_
p
refix() wher
e
ap
p
li
c
able
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
diff: a
d
d diff_line_prefi
x
function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eepi
n
g
d
iff
.
c: make constant
stri
n
g arg
u
m
e
nts const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: write p
r
efix to the cor
r
ect file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
graph: ou
t
put pa
d
ding
fo
r
m
erg
e
subsequent par
e
nts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John
K
eeping
t4038: ad
d
tes
t
s for "diff --cc
--raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
K
eeping
b
uiltin/app
l
y: tigh
t
e
n
(
dis)similarity index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John K
e
eping
mergetool--lib: list user
c
onfigured
too
l
s in '
-
-tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
o
h
n Ke
e
ping
Rename {g
i
t- => git}remo
t
e-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
Codin
g
Gu
i
delines: add Python codi
n
g gui
d
eli
n
es
commit
|
commitdiff
|
tree
2013-01-28
J
o
hn
Keepi
n
g
git-r
e
mo
t
e-testpy: fix path ha
s
hing
on Pyth
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
J
ohn
K
eeping
m
e
rgetool--lib: don't call "exit" in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n Keeping
git-difftool: use git-mergetool--li
b
for "--t
o
ol-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git
-
mergetool:
don'
t
hardcode 'me
r
ge
t
o
o
l
' in show_
t
ool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eep
i
n
g
git-mergeto
o
l:
r
e
mov
e
redu
n
d
ant a
s
signme
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Ke
e
ping
git-mergetool
:
m
o
v
e
s
how
_
tool_he
l
p to
mergetool
-
-lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
n
g
git-remote-testpy:
c
all print
as a fun
c
t
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git-remote-testpy: don't do
u
nbu
f
fered text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
git-remote-testpy: hash
bytes explicitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
s
v
n
-fe: allow
svnrdump_sim
.
py to run with Py
t
ho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_remote_helpe
r
s: use
2t
o
3
if
bui
l
d
i
ng
w
ith P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_re
m
ote_helpe
r
s: force rebuild if
p
ython versio
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keeping
git-cvsimport
.
txt: cvsps
-
2 is
deprec
a
ted
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
Joh
n
Keeping
git-for-each-ref
.
txt: 'raw' i
s
a s
u
pported date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John
Keeping
git
_
remot
e
_helpers:
fix input w
h
en r
u
n
n
i
n
g under Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next