repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'mg/fix-log-mergetag-color' into maint
2014-07-01
Charles Bailey
filter-branch:
eliminate
d
u
plicate mapped pa
r
ents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Cha
r
les Bai
l
ey
compat/
b
s
w
ap
.
h:
detect endia
n
ne
s
s
o
n m
o
r
e
p
latforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles B
a
iley
tests: don't rel
y
o
n
strerror te
x
t when test
i
ng rmd
i
r
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
d
i
r
.
c
:
make git_fnmatch
(
)
n
ot
i
n
l
i
n
e
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Char
l
e
s
Bailey
mergetool: Remove expl
i
c
it
r
eferences to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
C
h
ar
l
es Bailey
stash tests:
s
t
ash c
a
n
lose da
t
a i
n
a
file rem
o
ved
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Char
l
es Bai
l
e
y
st
a
s
h:
Don't overwrite files tha
t
have
g
one from
t
h
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Ch
a
r
l
es Ba
i
ley
Docume
n
tation
:
Des
c
r
ibe ot
h
er si
t
uations
w
here
-
z
af
f
ects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Cha
r
les Ba
i
ley
Chang
e
xd
l
_merge t
o
g
enerate outp
u
t
e
ven for n
u
ll merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Ch
a
rles Ba
i
ley
t6023: merge-file fails to
o
utput anythin
g
for a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Ch
a
rles Bailey
mergetool: fix running
m
ergetoo
l
in
sub-directori
e
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
a
r
les B
a
il
e
y
mergetool: Add a test for
running merg
e
t
oo
l
in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charle
s
Bailey
mergetool
:
respect autocrlf
by using checkout-i
n
dex
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Ch
a
r
l
es
Bailey
mergeto
o
l: Don't
k
eep te
m
por
a
ry merge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles B
a
iley
m
e
r
getool:
Add prompt to
c
ont
i
n
ue af
t
er failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles B
a
iley
A
d
d -y/--no-prompt option t
o
mer
g
e
to
o
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Ch
a
rle
s
Bailey
Fix
some tab/spa
c
e inconsistencies
i
n git-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bail
e
y
g
it-archive: work in bare
repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Ba
i
l
e
y
M
ake g
i
t arch
i
ve
r
espect core
.
autocrlf wh
e
n creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
h
a
r
le
s
Bailey
Add new
t
est to
d
emonst
r
ate git archive
c
ore
.
auto
c
rlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
harles
Bailey
m
erge-to
o
l docu
m
e
ntation: describe cus
t
o
m
command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Ba
i
l
ey
git-merg
e
tool
d
ocumentaiton: show too
l
nam
e
s in ty
p
ewrite
r
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
A
d
d a very basic test sc
r
ipt for
git merge
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Baile
y
Teach
g
it mergetool to use
c
u
stom co
m
m
ands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
B
a
iley
Cha
n
ged an internal var
i
able of mergetoo
l
to
supp
o
r
t
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
iley
Ti
d
y up git merget
o
ol
'
s bac
k
up file behaviou
r
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charl
e
s Bailey
gitk: Fix
th
e
M
akefile to cope with systems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
Remove old
g
en
e
rated files
f
r
om
.
g
i
tignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
harles Baile
y
Fix git-in
s
ta
w
eb
breakage on MacOS X due t
o
th
e
lim
i
ted
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles
B
aile
y
Fix clone not to i
g
nore depth wh
e
n performi
n
g a lo
c
a
l
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree