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
filter-branch: eliminate duplicate mapped parents
2014-07-01
Ch
a
rles Bailey
filter-branch: eliminate duplicate mapped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles B
a
iley
tests:
don't rely on str
e
rr
o
r text when t
e
s
t
i
n
g rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Char
l
e
s Bailey
dir
.
c: make gi
t
_fnm
a
t
c
h
()
not
i
n
line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles B
a
iley
m
erg
e
tool: Remove
explicit references t
o
/dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
C
h
arles
B
ailey
stash tes
t
s: stash can lose dat
a
in
a file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charle
s
Bai
l
ey
stash: Don't overwrite files tha
t
have gone fr
o
m
the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles
Bailey
D
o
cum
e
ntati
o
n: Describe o
t
her situation
s
where -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Ba
i
ley
Cha
n
ge
x
dl_merge to generate output eve
n
for nul
l
merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
har
l
es Bailey
t602
3
: merge-fil
e
fails to out
p
ut anything for a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charl
e
s Bail
e
y
mer
g
etool: f
i
x runn
i
ng merge
t
ool
i
n su
b
-
d
irectories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charle
s
B
ailey
mergetool: Add a
test for running mergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Char
l
e
s
Baile
y
merge
t
o
o
l: respect autocrlf by
u
si
n
g checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetool:
Don't keep temporary merge
f
i
l
e
s unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charl
e
s Bailey
mergetool: Add promp
t
to continue afte
r
failing t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Ch
a
r
l
es Bailey
Add -y/
-
-no-p
r
o
m
pt option to mer
g
et
o
ol
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles
Bailey
Fix som
e
tab/
s
pace in
c
onsistenc
i
es in git-mer
g
etool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
g
i
t-
a
rchive: work in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
r
les B
a
iley
Make gi
t
a
rchive respe
c
t core
.
a
utocrlf when creat
i
ng
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
harles Bail
e
y
Add n
e
w
test to demonstrate git ar
c
h
i
ve core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
r
les Ba
i
ley
m
e
r
ge-to
o
l
documenta
t
ion: descri
b
e custom command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
arles Ba
i
ley
g
i
t-m
e
r
g
eto
o
l
d
o
cumentaito
n
:
s
how
t
oolname
s
in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Ba
i
ley
Add a ve
r
y basic test script for git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les B
a
iley
T
e
ach git merge
t
ool to
u
se custo
m
com
m
ands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Cha
n
ge
d
a
n
i
nternal variabl
e
of merge
t
o
o
l to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tid
y
up git mergetool
'
s bac
k
up file
behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Char
l
es Bai
l
ey
gitk: Fix
the Makefi
l
e to cope with
sy
s
t
e
ms lac
k
in
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bai
l
ey
Re
m
ove o
l
d
genera
t
ed files
f
rom
.
gitig
n
ore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Ch
a
rles
B
ailey
Fix
git-instawe
b
breakag
e
on
MacOS X due to
the
limit
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Char
l
es Bailey
Fix clone not to ig
n
ore depth w
h
en
p
erformi
n
g a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
