repo.or.cz
/
alt-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 2.0.4
2014-07-22
John Keeping
com
p
l
e
t
i
on:
comp
l
e
te `git
pu
s
h
-
-force-w
i
th-lease=`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
Jo
h
n Keeping
compl
e
tion: add
some missing options t
o
`git push`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
Jo
h
n Keeping
co
m
p
l
e
t
ion
:
comple
t
e
"unstuck
"
`
g
it pu
s
h
-
-rec
u
r
se
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
Joh
n
Keeping
rebase: omit p
a
t
ch-identical commits with
-
-fork
-
point
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
John Keeping
rebase--am: use
--cherry-pi
c
k instead of -
-
ignore-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keepin
g
compl
e
tion
:
add
missing
o
ptions for git-merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
J
ohn Keeping
c
o
mpletion: add a note
t
hat merge options are s
h
ared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John
Keeping
builtin/mv: fix out of bounds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John K
e
eping
buil
t
in/mv: don'
t
u
s
e memory a
f
ter free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John
K
e
eping
utf8
:
use correct t
y
pe
f
or values
in
i
n
t
e
rv
a
l table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Kee
p
i
ng
utf
8
: fix icon
v
error detectio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
notes-utils: handle boolea
n
notes
.
rewrite
m
o
de corr
e
ctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
Jo
h
n
Keeping
M
akefi
l
e:
remove redu
n
da
n
t ob
j
e
c
t in git-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John Keeping
pull: su
p
pres
s
error when no
remoteref is f
o
und
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keepin
g
c
ompletion: handle --[no-]fo
r
k-p
o
int
opti
o
ns to g
i
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
compl
e
tion: com
p
le
t
e merge-base o
p
t
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keeping
rebase: fix fork-poin
t
wi
t
h z
e
ro argume
n
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Ke
e
ping
re
b
ase: us
e
reflog to find comm
o
n ba
s
e with
u
pstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John
K
e
e
ping
pul
l
: use merge-bas
e
--f
o
rk-
p
oint
w
hen appropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
pee
k
-remote: remove d
e
precated alias o
f
ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn
Keeping
l
o
st-found:
r
emove deprec
a
ted command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
tar-tree: remove deprecated
co
m
mand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
r
e
po
-
c
onfig: remove dep
r
e
ca
t
e
d
a
lias for "g
i
t config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
J
oh
n
Keeping
Do
c
u
m
entation/Makefile: make
A
scii
D
oc dblatex dir configurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John
K
e
eping
m
e
r
ge-recursive: fix
p
ar
s
in
g
of "diff-a
l
gorithm
"
o
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
r
e
set: handle submodule
with trailing slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm:
re-u
s
e parse_pat
h
spec's trailing-sl
a
sh rem
o
val
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Ke
e
p
i
ng
git_
r
e
m
ote_
h
elpers: remove l
i
ttle
used P
y
thon librar
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
Jo
h
n Keeping
rev-parse(1):
l
ogically group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-parse: remove rest
r
ictions on some options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keepi
n
g
pu
l
l
:
ch
a
nge the descripti
o
n to "integr
a
t
e
" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John K
e
eping
push: avo
i
d
suggestin
g
"
m
ergi
n
g" remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Joh
n
Kee
p
i
n
g
git-config(1): clarify precedence of multi
p
le values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
gi
t
-c
o
nfig:
u
pda
t
e doc
for --get
wi
t
h
mult
i
ple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
o
h
n
Keeping
c
ompleti
o
n: learn
ab
o
ut
-
-
man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
o
h
n
K
ee
p
ing
completion:
h
andle u
n
stuck form of ba
s
e
g
i
t options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keepi
n
g
fast-import: al
l
ow m
o
ving t
h
e root tre
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keep
i
ng
fa
s
t-impo
r
t: allow ls or filecopy of the
root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
Keeping
fas
t
-
i
mport: set valid
m
ode on root t
r
ee in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Ke
e
ping
t9300: docume
n
t fa
s
t
-
imp
o
rt empty p
a
th issu
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
sub
m
odule: dro
p
the top
-
level
requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
rev-parse
:
add --prefix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
su
b
module:
s
how
f
ull path in
e
r
ror messag
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
e
p
ing
t740
3
: add missing && chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t
74
0
3: mode
r
nize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keeping
t74
0
1: ma
k
e
indentation consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
mergetoo
l
--lib: refactor {di
f
f,merge}_cmd
lo
g
ic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
Docum
e
nta
t
io
n
/M
a
kef
i
le: move infodir to be with o
t
her
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn K
e
eping
Docu
m
e
n
tatio
n
/Mak
e
file: f
i
x spaces aroun
d
a
s
s
ignme
n
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
a
d
d--inter
a
ctive
:
re
s
pect d
i
ff
.
a
lgorith
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keeping
git-gui: fix file name handling with no
n
-e
m
pty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
f
etc
h
: don't try to update u
n
fetched trac
k
ing
r
efs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
Joh
n
Keeping
difftool: fix dir
-
diff when file
does not
e
x
ist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John K
e
eping
merge
-
t
ree
:
handle
dir
e
ctory/empt
y
c
onflict c
o
rrectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keep
i
ng
t/Make
f
il
e
: don'
t
d
efine TEST_R
E
SU
L
TS_D
I
R
E
CTORY rec
u
rsively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
Jo
h
n Keeping
contrib/subtree
:
d
on't dele
t
e remote branches if s
p
lit
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
Jo
h
n Keeping
test output: respect
$TEST_OUTPUT_D
I
RECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Ke
e
ping
t/Makefile: remove smoke t
e
st targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Joh
n
Keeping
merg
e
-tree: fix
typo in
"
b
ot
h
changed identicall
y
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
J
o
hn
Keeping
t
/
Makefi
l
e: fix
r
esult h
a
ndl
i
ng with TES
T
_OUTPUT_DIR
E
CTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
Kee
p
ing
trans
p
ort-help
e
r: add 'signed-ta
g
s
' capabil
i
ty
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
ing
transport-helper: pass --signed-tags=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-ex
p
ort: add
--signed-tags=w
a
rn-strip mod
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepi
n
g
t/test
-
lib
.
s
h
:
fix TRASH_DIREC
T
O
RY h
a
ndling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-tree: don't
p
rint e
n
tries that match
"loc
a
l"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitremote-hel
p
ers(1)
:
cla
r
ify refspec be
h
aviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
submo
d
ule: print graph
o
utput next to
s
ubmodule
l
og
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n Ke
e
ping
diff: allow unstu
c
k argume
n
ts with --diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn K
e
e
ping
git-me
r
ge(
1
): docu
m
e
n
t
d
iff-algorithm option to mer
g
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Jo
h
n Keeping
bisect: avoid signe
d
intege
r
overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John K
e
eping
diffco
r
e
-break: don't divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keeping
t7800: run --dir
-
di
f
f tests with and wit
h
out symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keepi
n
g
t7800: f
i
x tests when d
i
fftool uses
-
-no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
h
n Kee
p
ing
t78
0
0: d
o
n't hi
d
e grep
o
utput
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
d
i
f
ft
o
ol:
d
on't overwrite modified f
i
les
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t780
0
: m
o
ve '--symlinks
'
specif
i
c test
t
o the e
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
Joh
n
Keeping
merge-tr
e
e: fix ty
p
o in mer
g
e-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
re
f
s
.
c: fix fread error handlin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
en
t
ry:
f
ix filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eeping
t2003: mode
r
nize s
t
yle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eeping
d
ifftool --dir-diff: s
y
m
l
ink
all file
s
matchi
n
g the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
difftool: av
o
id d
o
u
b
l
e
slash
e
s in symlink targ
e
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-
d
ifftool(1): fix for
m
atting of --symlink des
c
ript
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John
Keeping
Revert "graph
.
c: mark privat
e
file-
s
cope
symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Kee
p
ing
Makefile: make m
a
ndir,
htmldir an
d
infodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
re
b
ase -i
:
r
e
s
p
ect co
r
e
.
comme
n
tc
h
ar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Kee
p
ing
combine
-
diff
.
c: teach combined d
i
ffs about
l
ine prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
iff
.
c: use dif
f
_
line_prefix() where applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
iff: add diff
_
li
n
e
_
prefix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: make c
o
nstant string arg
u
men
t
s const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: write prefix to the correct
f
ile
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
graph: output
p
a
dding f
o
r
merge subse
q
uent pa
r
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t
4
038: add tests for "d
i
ff --cc -
-
raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
built
i
n/ap
p
ly: t
i
ghten (dis)similarity index pa
r
sing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
m
e
rget
o
o
l--lib: list
user configured tool
s
in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Ke
e
p
ing
Rename {gi
t
- => git
}
remote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
Joh
n
Keeping
Cod
i
ng
G
uide
l
ines: add Pyth
o
n co
d
ing guidelines
commit
|
commitdiff
|
tree
2013-01-28
Joh
n
K
e
ep
i
ng
git-remote-testpy: fix
path hashing on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John K
e
eping
mergetool--l
i
b: don
'
t
call
"
exit" i
n
setup_t
o
ol
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
in
g
g
i
t-difft
o
ol: use
git-mergetool--li
b
for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next