repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
format-patch: Don't go over merge commits
2010-04-18
Charles
B
ailey
Documentation: Des
c
ribe
oth
e
r s
i
tuati
o
ns where -z
a
ffects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles
Bailey
Chan
g
e xdl_
m
er
g
e
t
o
generate
outp
u
t even for nul
l
me
r
ges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t6023
:
merge
-
f
ile
f
ails to outp
u
t anythi
n
g
f
or a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
arles Bai
l
ey
merg
e
tool: f
i
x
r
unn
i
ng mergeto
o
l in su
b
-di
r
e
c
t
o
ries
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
har
l
es Bailey
m
e
rgetool: Add a test for running merg
e
tool in
a
sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Cha
r
le
s
Bailey
mer
g
etoo
l
: resp
e
ct
a
u
tocrlf by using c
h
eckout-in
d
e
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bai
l
ey
mergeto
o
l: Don't keep temporary m
e
rge f
i
l
es unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charl
e
s
B
ailey
mergeto
o
l: Add
p
rom
p
t to
c
ontin
u
e a
f
te
r
failing
to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Char
l
es Bailey
Add -y/--
n
o
-pr
o
mpt
o
ption
t
o
m
ergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Char
l
es Bailey
Fix some
t
ab/space
i
n
c
o
nsi
s
te
n
cies in git-m
e
rget
o
ol
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Cha
r
les Ba
i
ley
git-a
r
c
h
ive: work i
n
bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
rles Ba
i
ley
M
ake git arch
i
ve res
p
ec
t
core
.
auto
c
rlf when creatin
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles
B
ailey
Add new test to demons
t
rate git archive core
.
aut
o
crlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
arle
s
Bai
l
e
y
merge-
t
ool
d
ocumentation: des
c
r
i
be cu
s
t
o
m command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charle
s
Bai
l
ey
git-mergetool do
c
umen
t
ai
t
on: show toolnames in
t
ypewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add a very basic test script fo
r
git
m
erge
t
o
o
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles Bailey
Teach
gi
t
m
e
r
ge
t
oo
l
to use c
u
s
tom
c
ommands defin
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
iley
Changed an in
t
ernal variable
o
f
m
er
g
etool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tidy u
p
git m
e
rg
e
tool's backup file
behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles
Bailey
gitk: Fix the Makefile to cope
w
ith systems
l
a
cking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
Remove
old gene
r
ated fil
e
s
from
.
gi
t
ignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Baile
y
Fix git-instaweb breakage on
Mac
O
S X due to th
e
l
i
mited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fix clone
n
ot to ignore depth
w
hen pe
r
fo
r
min
g
a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree