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
merge: force edit and no-ff mode when merging a tag object
2011-11-09
Junio C
H
amano
m
e
rge
:
f
orc
e
edit and no-ff
m
ode when merging a tag
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-09
Junio C Hama
n
o
c
ommit: c
o
p
y
mer
g
ed
s
ig
n
ed tags
t
o headers
o
f m
e
rge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-08
Junio C
Hamano
merge: record tag obje
c
ts without p
e
elin
g
in
M
E
RGE_HEAD
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-08
Junio C Hamano
merge
:
make
usage of
c
ommit->util
more extensible
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-08
Junio C Hamano
fmt-merge-msg: Add
c
ontents
of merg
e
d tag
in
the merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-07
Junio C Hamano
fmt-
m
e
r
g
e
-msg:
p
ackag
e
option
s
int
o
a structure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-07
Ju
n
io C Hamano
fmt-merge-msg: avo
i
d
e
a
r
l
y
r
e
turns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-07
Junio
C
Ha
m
ano
refs DWIMmer
y
: use the same r
u
l
e for both "g
i
t fetch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-07
J
u
n
i
o
C H
a
mano
fetch: a
l
low "git fe
t
c
h
$t
h
ere v1
.
0" to fetch
a
t
ag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-07
Junio C H
a
m
a
no
merge
:
n
otice local merging o
f
ta
g
s
a
n
d
keep it unwr
a
pped
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-05
Junio C
H
aman
o
Split GPG inter
f
ace into its o
w
n helper library
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-19
Junio
C Ham
a
n
o
Merge bra
n
ch 'js/merge-edit-option'
commit
|
commitdiff
|
tree
2011-10-19
Juni
o
C Hamano
M
erge br
a
nch
'rs/diff-whole-function'
commit
|
commitdiff
|
tree
2011-10-19
Junio
C Hamano
Merge branch 'rs/
p
icka
x
e'
commit
|
commitdiff
|
tree
2011-10-19
J
u
nio C
Haman
o
Me
r
ge branc
h
'js/no-cherry-pick-he
a
d
-after-punted'
commit
|
commitdiff
|
tree
2011-10-19
Juni
o
C
Haman
o
Merge branch 'bk/submodule-in-r
e
cur
s
ive-me
r
ge
'
commit
|
commitdiff
|
tree
2011-10-19
Juni
o
C
H
amano
M
erge b
r
a
n
ch
'jm/maint-apply
-
detects-corrupt-patch
.
.
.
commit
|
commitdiff
|
tree
2011-10-19
J
unio C Hamano
M
e
rge
b
ranch 'jk/config-test
-
cleanup'
commit
|
commitdiff
|
tree
2011-10-19
Junio
C
H
aman
o
Merge bra
n
ch 'j
s
/log-show-childre
n
'
commit
|
commitdiff
|
tree
2011-10-19
Ju
n
io C Hamano
Merge bran
c
h '
c
b/h
t
tpd
-
test-fix-p
o
rt
'
commit
|
commitdiff
|
tree
2011-10-19
Junio C Haman
o
Merge branch 'jn/gitwe
b
-m
a
npages'
commit
|
commitdiff
|
tree
2011-10-19
Junio C Hama
n
o
M
er
g
e
branch 'pt/mingw-misc
-
fixes'
commit
|
commitdiff
|
tree
2011-10-19
Junio C Hamano
Merg
e
br
a
n
c
h 'md/smtp-tls-hello-again'
commit
|
commitdiff
|
tree
2011-10-19
J
u
nio C Hamano
M
erge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2011-10-18
Junio C H
a
mano
Update d
r
aft r
e
lease notes to 1
.
7
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-18
Junio C H
a
ma
n
o
Me
r
ge br
a
nch 'jk/http-auth'
commit
|
commitdiff
|
tree
2011-10-18
Junio C Hamano
Merge bra
n
ch 'js/check-ref
-
format-test-mingw
'
commit
|
commitdiff
|
tree
2011-10-18
Jun
i
o C
H
aman
o
Merg
e
branch 'jk/pull-rebase-with-w
o
rk-tr
e
e'
commit
|
commitdiff
|
tree
2011-10-18
Junio C Hamano
M
e
rge
b
ranch 'jk/config-test-cleanup'
commit
|
commitdiff
|
tree
2011-10-18
Jun
i
o
C Ha
m
ano
M
erge branch 'bc
/
a
ttr
-
ignore-case'
commit
|
commitdiff
|
tree
2011-10-18
Junio C Hama
n
o
Merge branch 'sg/completion'
commit
|
commitdiff
|
tree
2011-10-18
Jun
i
o
C
H
amano
Merge branch 'mm/mai
n
t-config
-
e
x
p
licit-bool-display
'
commit
|
commitdiff
|
tree
2011-10-18
J
u
nio C Hamano
Merg
e
branch 'tc/
f
etch-leak'
commit
|
commitdiff
|
tree
2011-10-18
Ju
n
io
C Hamano
M
e
rge branch
'
jk/name-ha
s
h-dirent'
commit
|
commitdiff
|
tree
2011-10-18
Junio C Hamano
Merge branc
h
'ef/
m
ingw-syslog'
commit
|
commitdiff
|
tree
2011-10-18
Junio
C
Hamano
Me
r
ge branch
'tm/compl
e
tion-
p
u
sh
-
set-upstr
e
am'
commit
|
commitdiff
|
tree
2011-10-18
Junio C Hamano
Merge b
r
anch 'tm/co
m
pl
e
tion-commit-fixup-squash'
commit
|
commitdiff
|
tree
2011-10-18
Junio C Hamano
Merge branch 'ph/push-to-delete-nothing'
commit
|
commitdiff
|
tree
2011-10-18
Junio C Hamano
Merge
branch 'jc
/
checkout
-
from
-
tree-keep-local-chan
g
es
'
commit
|
commitdiff
|
tree
2011-10-18
J
unio
C
Haman
o
Merge branch
'
js/bisect-n
o
-checko
u
t
'
commit
|
commitdiff
|
tree
2011-10-17
Juni
o
C
Haman
o
resolve
_
g
itlink_pack
e
d_
r
ef
(
): fix mismerge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-16
J
unio C Haman
o
Upda
t
e draft release notes to
1
.
7
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-16
Junio C Hama
n
o
Merg
e
git
:
//repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2011-10-16
Junio C Hamano
Sync with
m
aint
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-16
Junio C Hamano
Prepare for 1
.
7
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-16
Junio C Ha
m
a
n
o
Merge branch 'ms/patch-i
d
-
w
i
th-overlo
n
g-lin
e
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-10-16
Junio C Hamano
Merge
b
ranch
'
jc/maint-bundle-to
o
-
quiet' into maint
commit
|
commitdiff
|
tree
2011-10-16
Junio
C
Hamano
Mer
g
e
branch
'
jk/filter-branc
h
-re
q
uire-clean-work-tree
.
.
.
commit
|
commitdiff
|
tree
2011-10-16
Juni
o
C Hamano
Merge branch 'jc/m
a
int-fsck-f
w
r
i
t
e
-si
z
e-check' into
.
.
.
commit
|
commitdiff
|
tree
2011-10-16
Jun
i
o
C
H
a
mano
Merge branch 'bk/ancestry-pat
h
'
into mai
n
t
commit
|
commitdiff
|
tree
2011-10-16
Junio
C
Hamano
Merge
b
ranch 'jk/
m
aint-fetch
-
submodule-check-fix
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-10-16
Junio C Hamano
Merge branc
h
'tr/merg
e
t
ool-val
g
rind' into ma
i
nt
commit
|
commitdiff
|
tree
2011-10-16
Junio
C
Haman
o
Me
r
g
e br
a
nch 'nm/grep-object-sha
1
-l
o
c
k' i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2011-10-16
Junio C Ha
m
an
o
M
erge br
a
nc
h
'jc/diff-index-unpack' into
m
aint
commit
|
commitdiff
|
tree
2011-10-16
Junio C Hamano
Merge branch 'm
m
/rebase-i-ex
e
c-
e
dit' int
o
maint
commit
|
commitdiff
|
tree
2011-10-16
Ju
n
i
o C Hamano
Merge b
r
anch 'jc/grep-untr
a
cked-ex
c
lude'
commit
|
commitdiff
|
tree
2011-10-16
Junio C Hamano
Merge bra
n
c
h 'j
c
/main
t
-grep-untr
a
cked-exclude'
into
.
.
.
commit
|
commitdiff
|
tree
2011-10-14
Junio C Ham
a
no
Mer
g
e b
r
anch
'maint'
commit
|
commitdiff
|
tree
2011-10-14
J
unio C Hamano
Update d
r
aft re
l
ease notes to 1
.
7
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-14
J
unio C Hamano
M
erge branch 'j
s
/maint-m
e
rge-on
e
-file-os
x
-
expr'
commit
|
commitdiff
|
tree
2011-10-14
J
unio C Hamano
Merge
b
ranch 'jn
/
ident-fro
m
-etc-mailname'
commit
|
commitdiff
|
tree
2011-10-14
Junio C Hamano
Merge branch 'il
/
archive-err-signa
l
'
commit
|
commitdiff
|
tree
2011-10-14
J
u
nio C Hamano
Mer
g
e branch 'jc/grep-
u
ntr
a
cked-exc
l
ude'
commit
|
commitdiff
|
tree
2011-10-14
Junio C
Hamano
Merge br
a
nch 'rs/d
i
ff
-
cleanup-re
c
ords-fix'
commit
|
commitdiff
|
tree
2011-10-14
Juni
o
C Hamano
M
e
rge branch 'rs/
p
e
nd
i
ng'
commit
|
commitdiff
|
tree
2011-10-14
Junio
C
Hamano
Merge branc
h
'
j
n/no-g-plus-s-on
-
bsd'
commit
|
commitdiff
|
tree
2011-10-14
J
u
nio
C Hamano
Merge branch '
j
c/is
-
url-simp
l
ify
'
commit
|
commitdiff
|
tree
2011-10-14
Junio C Hamano
Merge bran
c
h 'nd/git-daemon-error-msgs'
commit
|
commitdiff
|
tree
2011-10-14
Juni
o
C Hamano
M
e
rge
branch 'nd/daemon-log-sock-errors'
commit
|
commitdiff
|
tree
2011-10-14
Junio
C
Ha
m
ano
M
e
r
ge branch 'cp/git-
w
eb-browse-brows
e
rs'
commit
|
commitdiff
|
tree
2011-10-14
Jun
i
o
C Hamano
Merge b
r
anch 'jc/a
p
ply-
b
lank-at-eof-fix'
commit
|
commitdiff
|
tree
2011-10-14
Junio C Hamano
Mer
g
e bra
n
ch 'di/fas
t
-impo
r
t-empty
-
ta
g
-note-fix'
commit
|
commitdiff
|
tree
2011-10-14
Junio C Hamano
M
erg
e
branch
'nd/maint-autofix-tag-i
n
-head'
commit
|
commitdiff
|
tree
2011-10-14
Junio C Hamano
Merge branch 'bw/grep-
n
o
-
index
-
no-exclud
e
'
commit
|
commitdiff
|
tree
2011-10-14
Junio C
H
amano
Merge branch 'nd/mai
n
t-s
p
arse-errors'
commit
|
commitdiff
|
tree
2011-10-12
J
unio C
H
amano
Update
d
raft relea
s
e
no
t
es to 1
.
7
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-12
Jun
i
o C
Hamano
Merge branch 'cb/do
-
not-
p
re
t
end
-
t
o-h
i
jack-long-help'
commit
|
commitdiff
|
tree
2011-10-12
Junio C Hamano
M
e
rge br
a
nc
h
'sp/smart-http-f
a
ilu
r
e
'
commit
|
commitdiff
|
tree
2011-10-12
J
u
nio C
H
a
m
a
no
Merge branc
h
'nd/doc
u
ment-err
-
packet'
commit
|
commitdiff
|
tree
2011-10-12
Junio C Hamano
Merge
b
ranch '
j
c
/
parse-options-boolean'
commit
|
commitdiff
|
tree
2011-10-12
Junio C Hamano
Merge branch 'rs/test-ctype'
commit
|
commitdiff
|
tree
2011-10-12
Junio C
H
a
ma
n
o
Merge branch 'rs/name-rev-usag
e
'
commit
|
commitdiff
|
tree
2011-10-12
Junio C
H
ama
n
o
Merge branch
'c
s
/perl-
c
onfig-path-sen
d
-email'
commit
|
commitdiff
|
tree
2011-10-12
Junio C Hamano
Mer
g
e
branch 'zj
/
send
-
email-authen-sasl'
commit
|
commitdiff
|
tree
2011-10-10
Junio C Hamano
Update dr
a
ft release notes
t
o
1
.
7
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-10
Junio C
Ha
m
ano
Merg
e
branc
h
'd
m
/tree-w
a
l
k'
commit
|
commitdiff
|
tree
2011-10-10
Juni
o
C Hamano
Merge bran
c
h '
p
s/gitweb-js-
w
ith-lineno'
commit
|
commitdiff
|
tree
2011-10-10
Juni
o
C Hamano
Merge br
a
nch
'mh
/
main
t
-not
e
s-merge-pathbuf
-
fix'
commit
|
commitdiff
|
tree
2011-10-10
Ju
n
io C
H
a
mano
Merge branch 'nd/sparse-do
c
'
commit
|
commitdiff
|
tree
2011-10-10
Junio C Ha
m
ano
Merg
e
branch 'jp
/
get
-
re
f
-dir-unsorted'
commit
|
commitdiff
|
tree
2011-10-10
J
uni
o
C Haman
o
Merge branch 'mh/check-r
e
f-format-3'
commit
|
commitdiff
|
tree
2011-10-10
Junio C Hamano
Merge branch
'mh/iterat
e
-
r
efs'
commit
|
commitdiff
|
tree
2011-10-10
J
u
nio C Ha
m
ano
Merge branch 'jm/
m
er
g
etool-pathspec
'
commit
|
commitdiff
|
tree
2011-10-10
Junio C
Hamano
Merge branch 'jc
/
maint
-
diffstat-numstat
-
co
n
text
'
commit
|
commitdiff
|
tree
2011-10-10
J
u
nio C
Hamano
Merg
e
branc
h
'm
z
/re
m
ote-ren
a
m
e'
commit
|
commitdiff
|
tree
2011-10-10
Junio C Hamano
Merge branch '
c
b/common-pre
f
i
x-unification'
commit
|
commitdiff
|
tree
2011-10-10
J
u
n
io
C
H
a
mano
M
e
rge branch 'jn/maint-http-e
r
ror-message'
commit
|
commitdiff
|
tree
2011-10-10
Jun
i
o C Hamano
Merge branch 'hv/submodule-update-none'
commit
|
commitdiff
|
tree
2011-10-10
Junio C Haman
o
Merge bra
n
ch 'fg/submodule-git-file-gi
t
-di
r
'
commit
|
commitdiff
|
tree
2011-10-09
J
u
n
io C Hamano
Makefile: fix p
e
rm
i
ssions of mergetools/ checked out
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next