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
clone: initialize atexit cleanup handler earlier
2014-07-01
Char
l
es
Bailey
filter
-
branch: eliminate duplicate ma
p
ped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Ch
a
rles Bailey
c
omp
a
t/bswap
.
h
: detect
end
i
anness on
more p
l
atforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Ba
i
ley
tests: don't r
e
ly on strerr
o
r text w
h
en testing rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bail
e
y
dir
.
c: m
a
k
e
git_fnmatch() not
i
nlin
e
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles
Bailey
mergetool: Remove expli
c
it reference
s
t
o
/dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Baile
y
stash tests: stash ca
n
lose data in
a file
removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
harles Bailey
stash:
Don'
t
overwri
t
e f
i
le
s
that have gone fr
o
m
the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
h
a
rles Bail
e
y
Docum
e
nt
a
tion: Descri
b
e o
t
he
r
situations
w
here -
z
affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charle
s
Bai
l
ey
Change
x
d
l
_merge to
generat
e
output even f
o
r null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
a
rles Ba
i
ley
t6023: merge-file fails to output anything for a degener
a
te
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Cha
r
le
s
Bailey
merg
e
tool
:
fix running merge
t
o
ol in sub-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
mergetool
:
Add
a
test
f
or running mer
g
etool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Cha
r
les Bailey
m
e
rgeto
o
l: res
p
ec
t
autocrlf by usi
n
g checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
harles Bail
e
y
m
e
rget
o
ol:
Don't keep temporary merge files unl
e
ss
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
a
r
les
B
ailey
mergetool:
A
dd pr
o
mpt to cont
i
nue
after fail
i
ng
t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
arles Bailey
A
dd -y/--n
o
-prompt o
p
tion to
m
e
r
geto
o
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
harles
B
ailey
Fix some tab/space
inconsist
e
nc
i
es in
g
i
t
-
mergetool
.
s
h
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
C
h
ar
l
es B
a
iley
g
i
t-archive: w
o
rk in bare repo
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make git arch
i
ve
respect
core
.
a
u
t
ocr
l
f when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Char
l
es
Baile
y
Add new
test to demonstra
t
e git
a
rchive core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charl
e
s Bailey
merge-
t
oo
l
document
a
tion: des
c
ribe cus
t
om comm
a
nd usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
git-
m
e
r
getool d
o
c
u
m
entaito
n
: s
h
ow
t
oolnames in typewrite
r
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Ad
d
a very b
a
sic test script for gi
t
m
e
rget
o
ol
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Ba
i
ley
Teach git merg
e
tool to u
s
e
custom
c
ommands defin
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Changed an i
n
ternal
v
a
riab
l
e of merget
o
o
l
t
o
support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s B
a
i
l
e
y
Ti
d
y up
g
it merg
e
tool's backup
f
il
e
b
e
haviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
gitk: Fix
the Ma
k
efi
l
e to
c
op
e
with systems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bail
e
y
Remove
old
generated files from
.
g
i
tignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
h
arles
B
ail
e
y
Fix g
i
t-instaweb break
a
g
e on MacOS X due to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Cha
r
les Bailey
Fix clone
not to ignor
e
depth whe
n
p
erforming a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree