repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Update git-merge documentation.
2007-07-05
Joh
a
nnes Sixt
Allow
r
e
b
ase to run if upstream is complet
e
ly m
e
rged
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-07-04
J
o
hannes Sixt
fil
t
er-branch
d
oc
u
men
t
ation: some more touch-ups
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-07-04
Joha
n
nes Sixt
fi
l
t
e
r-br
a
n
c
h:
A
void an error message in
t
he map function
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-07-03
J
o
h
a
nne
s
S
ixt
Test 'git add' for unmerged
e
ntries
w
hen
c
ore
.
symlinks
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-06-13
J
ohann
e
s Si
x
t
gi
t
-re
m
ote show: Als
o
short
e
n no
n
-fast-f
o
r
w
ard refs
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-06-12
Johan
n
e
s
Sixt
Remove trailing sl
a
sh fro
m
$(
t
e
mplate
_
dir
)
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-06-12
Johannes Sixt
Avo
i
d double-slash in path
names that d
e
p
end
o
n $(sharedir
)
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-06-09
Johannes S
i
x
t
filter-bran
c
h: subdire
c
to
r
y filter needs --ful
l
-
h
is
t
ory
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-06-09
Johannes Sixt
filter-
b
ranc
h
:
S
implify parent c
o
mputation
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-06-06
Jo
h
anne
s
Sixt
Accept dates before 2
0
0
0
/
01
/
01 when specified as
s
econds
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-06-06
Joh
a
nnes
S
ixt
Make
f
ile: Remov
e
git-merge-base from
PROG
R
AMS
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-06-06
J
o
hannes Sixt
filter-branch: also
don'
t
fail in
map()
if a
c
o
m
mit
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-06-06
J
o
han
n
e
s
Sixt
filter-branch:
Use rev-list arguments to
s
pecify revision
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-05-08
Johan
n
es Sixt
g
it-gui:
C
a
l
l changes "
S
t
a
ged" and "Unstaged" in file
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-03-20
Johannes Sixt
Teach git
-
remot
e
to list pus
h
ed b
r
anches
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-03-04
J
o
hannes S
i
xt
T
e
ll multi-parent diff ab
o
ut core
.
syml
i
nks
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-03-04
Johannes S
i
xt
Handle core
.
s
yml
i
nks=false c
a
se in merge-recursive
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-03-03
J
ohannes Sixt
Add core
.
symlinks to ma
r
k f
i
lesystems that do not support
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-01-30
Johannes Si
x
t
Add a missing fork() error check
.
commit
|
commitdiff
|
tree
2006-11-13
Johannes Sixt
Catch error
s
when writing an
index t
h
at co
n
tains invalid
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2006-11-13
Jo
h
annes Sixt
test
-
l
ib
.
sh
:
A command
dying due to a
s
igna
l
is an
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree