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
blame: allow "blame file" in the middle of a conflicted merge
2012-05-24
Avery Pennarun
checkout:
n
o progress messages if !isatty(2)
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
Ex
t
end m
e
r
ge-subt
r
e
e tests to test -Xsubtree=dir
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery P
e
nnar
u
n
Teach git-pu
l
l
to
p
a
ss -X<option> to git-merge
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Penn
a
run
git merge -X<option>
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2009-11-30
Avery Pennarun
buil
t
in-merge
.
c:
call ex
c
lude_cmds()
correc
t
ly
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-08-04
Avery
Pennarun
git-svn: Abort
with an er
r
or if '
f
et
c
h' parame
t
er is
.
.
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-08-02
Av
e
ry Penn
a
run
Teach "git diff -p"
Pascal/Delphi funcna
m
e
pattern
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-07-17
Avery Pennarun
Re
w
ord "your branch
h
as diverged
.
.
.
"
lin
e
s to redu
c
e
.
.
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-06-29
Avery Pennarun
git-svn: av
o
id filling up the
disk with
temp files
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-06-14
A
v
ery Penn
a
run
git-svn: test tha
t
extra blank lines ar
e
n
't inserted
.
.
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-06-14
Avery Pe
n
narun
gi
t
-
s
vn: don't append extra
newli
n
es at the end of
.
.
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-05-05
Avery Pennarun
git-sv
n
: a
d
d
d
oc
u
ment
a
tion
for --add-au
t
hor
-
from option
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-05-05
A
v
ery Penna
r
u
n
g
it
-
sv
n
: Add
--add-author-from
o
ption
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-05-05
Avery P
e
nnarun
g
i
t-svn: add document
a
tion for
-
-use-lo
g
-author option
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree