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
git-push.txt: clean up force-with-lease wording
2014-07-01
C
h
arles B
a
iley
filter-branch: eli
m
inate duplicate
mapped par
e
nts
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
C
h
arles Bail
e
y
compat/bswap
.
h
:
detec
t
endiannes
s
on more platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles B
a
iley
tests: don't rely on
s
trerr
o
r text whe
n
t
e
sting rmd
i
r
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charle
s
Bailey
dir
.
c: make g
i
t_fnma
t
ch()
not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bailey
mergetoo
l
: Remove explicit refere
n
ces to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Cha
r
l
e
s
B
a
iley
stash tests: stash can lose data in
a
file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Ch
a
rles
B
ai
l
ey
s
tash: Don
'
t ove
r
write files that ha
v
e gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Ch
a
r
l
es Bailey
D
ocumentat
i
on:
D
escribe other sit
u
ations where -z a
f
fects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
Chang
e
xdl_m
e
rge to generat
e
ou
t
put even for n
u
ll me
r
ges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Baile
y
t6023: merge-file
fails to o
u
tp
u
t anything
for a deg
e
nerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
harles Ba
i
ley
mergetool: fix runn
i
ng mergeto
o
l
in sub-directorie
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charl
e
s Baile
y
m
ergeto
o
l
: A
d
d a t
e
st for running mergetool in
a su
b
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charle
s
Bailey
m
e
rgeto
o
l
:
respect autocr
l
f by
u
s
i
ng checkout-i
n
dex
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Cha
r
le
s
B
ailey
mergetool: Don't ke
e
p temporary merge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Baile
y
mergetool
:
Add prompt to c
o
ntin
u
e after
failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
harles Bail
e
y
Add -y/-
-
no-prompt
o
ption
to
m
erge
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Cha
r
l
e
s
Ba
i
ley
Fix
so
m
e ta
b
/space in
c
onsi
s
tencies
i
n git-
m
erg
e
tool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charle
s
Bailey
git-archive
:
work
i
n bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Cha
r
l
es
B
a
iley
Make git archive respect co
r
e
.
autocrlf when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
h
a
r
les Ba
i
ley
Add n
e
w test t
o
demonstrate
g
it archive
c
ore
.
au
t
ocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Cha
r
les B
a
iley
mer
g
e-tool documentation: describe custom c
o
m
m
a
nd usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charle
s
Bai
l
ey
gi
t
-m
e
rgetool documentaito
n
: show
toolnames in t
y
pew
r
i
ter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
i
l
ey
Add a
v
ery basic t
e
st scr
i
pt for git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bai
l
ey
Teach
g
i
t m
e
rgetool to use custom
command
s
de
f
ined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
ar
l
es Bailey
C
hanged
a
n internal va
r
iable of me
r
getoo
l
to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
ar
l
e
s
Ba
i
ley
Tidy up git
m
ergetool's back
u
p
file b
e
haviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles B
a
iley
git
k
:
F
ix t
h
e Makefile to cope with systems
l
acking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
Rem
o
ve old
g
enerate
d
files from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charl
e
s Bailey
F
ix git-instaweb bre
a
kage on
M
acOS X due to
t
he l
i
mit
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
h
arl
e
s Bailey
Fix cl
o
ne not to
ign
o
r
e
depth when pe
r
form
i
ng a loca
l
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree