repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: Avoid excessive output for and reprocessing of renames
2010-04-18
C
harles Bailey
D
o
cumentation: D
e
scri
b
e
other
sit
u
ations w
h
ere -z affec
t
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Cha
r
les
B
ailey
Change xdl_merge to g
e
ne
r
ate outp
u
t even for
null
m
erges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
arles Bailey
t6023: merge-file fails to output anything
f
or a
dege
n
e
rate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
harles
B
ai
l
e
y
me
r
getool:
fix r
u
n
n
ing mer
g
etool
i
n
s
ub-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
harles
B
aile
y
m
e
rgetool
:
Add a test for
running mergetool in a
s
ub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles
B
a
i
ley
m
e
rgetool: res
p
ect
a
u
t
o
c
r
l
f by using ch
e
ckout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetool: Don
'
t k
e
ep tempo
r
a
ry me
r
ge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Ch
a
rles
Bailey
m
ergetool: Add prom
p
t
to continue after failing
t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles
B
ailey
Add -y/--no-prompt option
to
m
ergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
arles Bai
l
ey
Fix
some tab
/
space
inc
o
nsiste
n
c
i
es i
n
git-merg
e
tool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Char
l
es Bai
l
e
y
git-
a
r
chive:
wor
k
in bare rep
o
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
harles Bailey
M
a
k
e
gi
t
archive
respect
cor
e
.
autoc
r
lf
w
h
e
n creat
i
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Char
l
es Bailey
Add new test to demon
s
trate git archive core
.
auto
c
rlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charle
s
Bailey
merge-tool documentation: describe cus
t
om co
m
mand usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rl
e
s Bai
l
ey
git-mergetool documentaiton: show t
o
olnames in
t
ypewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles Bailey
Add a ve
r
y basic test
s
cript for git me
r
ge
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles B
a
iley
Te
a
ch
git me
r
get
o
ol
to use cust
o
m
c
omma
n
d
s d
e
f
i
ne
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bailey
Changed an internal
v
ariab
l
e o
f
mergetool
to s
u
pport
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Bailey
Tidy
up git mergetool's
b
a
cku
p
file behav
i
o
ur
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
gitk: F
i
x the Makefil
e
to cope with systems la
c
king
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Ch
a
rles Bailey
Remove old generate
d
files from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Baile
y
Fix gi
t
-instaweb
b
r
eak
a
ge on Ma
c
OS X
d
ue to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
h
a
rle
s
Bailey
Fix clon
e
no
t
to ignore depth whe
n
performi
n
g a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree