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
t2004: standardize file naming in symlink test
2014-07-01
C
harl
e
s Bailey
filter-bran
c
h:
elimin
a
te dup
l
icate mapped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Bailey
compat/bswap
.
h: de
t
ect endiannes
s
on mo
r
e platfo
r
ms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
tests: don't rel
y
on
s
t
r
e
r
ror
text when
testing rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles B
a
i
l
ey
dir
.
c: make git_
f
nmatc
h
() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Ch
a
rles Bailey
mer
g
etool
:
Remove e
x
pli
c
i
t
r
e
ferenc
e
s
t
o
/dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
C
h
arles B
a
il
e
y
s
t
a
s
h tests: stas
h
can lose data
in a file r
e
moved
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Baile
y
stash: Don't overwrite f
i
les that have gone from th
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Ba
i
l
e
y
D
oc
u
m
e
ntation: Describe othe
r
situations where
-
z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
Change
x
d
l_merge to genera
t
e out
p
ut
e
v
e
n for
nu
l
l merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Char
l
e
s
Bailey
t60
2
3: m
e
rge-file fails
to output
any
t
hing f
o
r a degenera
t
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
mer
g
etool: fix running mergetool in sub-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Cha
r
les Bailey
merg
e
tool
:
Add a
t
est fo
r
running
mergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
C
h
arle
s
Ba
i
ley
mergetool:
r
es
p
ect autocrlf
by using
c
h
eckout
-
index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Cha
r
l
e
s Bailey
mergeto
o
l: D
o
n
'
t keep temporary
m
e
rge files un
l
ess
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bai
l
ey
mergetoo
l
: Add prompt to
cont
i
nue after fai
l
ing
t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
arles Bailey
Add -y/-
-
no-prompt op
t
i
o
n to me
r
getool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bail
e
y
Fix some tab/space i
n
consistenci
e
s in gi
t
-mer
g
etool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Baile
y
gi
t
-a
r
c
h
ive: work
i
n bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charle
s
Bailey
Make g
i
t archive
r
espect co
r
e
.
a
utocrlf when
c
reating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Ba
i
ley
Ad
d
new
t
e
s
t t
o
demonstrate git archive core
.
autocrl
f
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bai
l
ey
merge-too
l
document
a
t
i
on: describe custo
m
c
omma
n
d usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
git-mergetool docu
m
enta
i
to
n
: s
h
ow toolnames in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
a
rles Ba
i
ley
Add a v
e
ry ba
s
ic test script for git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
e
s
Bailey
Tea
c
h git mergetoo
l
to us
e
cust
o
m comman
d
s
d
ef
i
ned
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Bailey
Changed an inter
n
a
l var
i
able of mergetool t
o
suppor
t
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bai
l
ey
Tidy up git mergetool's backu
p
file b
e
haviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charle
s
Bailey
git
k
: Fix
t
he Makefi
l
e
to
c
op
e
with systems
lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
Remove old
g
enerated files from
.
g
itignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
har
l
e
s
B
ai
l
ey
Fi
x
git-i
n
s
taweb breakage o
n
Ma
c
OS X due to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charle
s
Bai
l
e
y
Fi
x
clo
n
e no
t
to ign
o
r
e
depth when
p
e
rf
o
rmi
n
g a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
