repo.or.cz
/
git
/
mjg.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
Jun
i
o C Hamano
m
erge: force edit and no
-
ff mode when m
e
rging a tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-09
Junio C Hamano
co
m
mit: copy merged signed
tags
t
o h
e
a
de
r
s of merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-08
Junio C Hamano
merge: record tag o
b
jects without
peeling in MERGE_HEAD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-08
Ju
n
i
o
C Haman
o
m
e
rg
e
: make
usage
o
f commit
-
>util mo
r
e
e
x
tensible
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-08
J
u
nio C
H
a
ma
n
o
fmt-merge-msg: Add contents of merged tag in t
h
e merg
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-07
Junio C Hamano
fmt-me
r
ge
-
m
s
g: package options into
a
s
tructure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-07
Junio C Ha
m
ano
fmt-merge-msg: avoi
d
earl
y
return
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-07
Junio
C Ha
m
a
n
o
r
efs D
W
I
Mmery: use the same ru
l
e for
b
oth "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 Hamano
fet
c
h: allow "git fetch $
t
here v1
.
0"
t
o fetch
a
tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-07
J
unio C Hamano
merge:
no
t
ic
e
local merging of
tags a
n
d
ke
e
p
i
t unwra
p
ped
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-05
Ju
n
io C Hamano
Split GPG interfa
c
e
into its own hel
p
er librar
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-19
Junio C H
a
mano
Mer
g
e branch 'j
s
/mer
g
e-
e
dit-option
'
commit
|
commitdiff
|
tree
2011-10-19
Ju
n
io C Hamano
Merge branch 'rs/diff-
w
h
o
le-function'
commit
|
commitdiff
|
tree
2011-10-19
Juni
o
C
Ha
m
ano
Merge branch 'rs/pickaxe
'
commit
|
commitdiff
|
tree
2011-10-19
Junio
C
H
am
a
no
Merge
branc
h
'j
s
/no-c
h
erry-pick-
h
ead-a
f
ter-punted'
commit
|
commitdiff
|
tree
2011-10-19
Junio C Hamano
M
e
rge branch 'bk/submodu
l
e
-in-recursiv
e
-
m
erge'
commit
|
commitdiff
|
tree
2011-10-19
J
u
nio C Hamano
Merge bra
n
ch 'jm/maint-
a
pply-detects-cor
r
upt-patch
.
.
.
commit
|
commitdiff
|
tree
2011-10-19
J
u
nio C Ha
m
ano
Merge branc
h
'jk/config-test
-
c
l
e
anup'
commit
|
commitdiff
|
tree
2011-10-19
Junio C Hamano
Merge bra
n
ch
'
js/l
o
g
-
s
h
ow-
c
hildren'
commit
|
commitdiff
|
tree
2011-10-19
Jun
i
o C
Hamano
Merge bran
c
h 'cb/httpd-test-fix-port'
commit
|
commitdiff
|
tree
2011-10-19
Ju
n
i
o
C H
a
mano
Me
r
g
e branch '
j
n/git
w
e
b
-m
a
n
p
a
ges'
commit
|
commitdiff
|
tree
2011-10-19
Junio C Hamano
Merge
br
a
nch 'pt/
m
i
n
gw-misc
-
fixes'
commit
|
commitdiff
|
tree
2011-10-19
Junio C Ham
a
no
Me
r
ge b
r
anch
'
md
/
s
m
tp-tls-hell
o
-again'
commit
|
commitdiff
|
tree
2011-10-19
Junio C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-10-18
Junio C Hamano
Up
d
ate
d
raft re
l
ease no
t
e
s to 1
.
7
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-18
Junio C Ham
a
n
o
Merge bran
c
h
'
jk
/
h
ttp-
a
uth'
commit
|
commitdiff
|
tree
2011-10-18
Junio C Hama
n
o
M
e
r
ge
branch
'
js/chec
k
-
r
ef-format-test
-
min
g
w'
commit
|
commitdiff
|
tree
2011-10-18
Junio C Ha
m
ano
Merge branch 'jk/pull-r
e
b
ase-
w
it
h
-work-tree'
commit
|
commitdiff
|
tree
2011-10-18
Junio C Ha
m
ano
Merge branch '
j
k/config-test-
c
leanu
p
'
commit
|
commitdiff
|
tree
2011-10-18
J
u
ni
o
C
Hamano
Merge
branch 'bc/
a
tt
r
-ignore-case'
commit
|
commitdiff
|
tree
2011-10-18
Ju
n
io C Hamano
Merg
e
branch 'sg/comp
l
etion'
commit
|
commitdiff
|
tree
2011-10-18
J
u
nio C Hama
n
o
Merge branch '
m
m/maint-
c
on
f
ig-e
x
plicit-bool-d
i
spl
a
y'
commit
|
commitdiff
|
tree
2011-10-18
Junio C Hama
n
o
M
erge branch 'tc/fetch-le
a
k
'
commit
|
commitdiff
|
tree
2011-10-18
Junio C Hama
n
o
Merge branch
'
jk/name-
h
ash-dirent'
commit
|
commitdiff
|
tree
2011-10-18
Junio
C
H
amano
Merge branch
'
ef/mingw-
s
yslog'
commit
|
commitdiff
|
tree
2011-10-18
Junio C
Hamano
Merge branch 'tm/co
m
pletion-push-
s
et-upstre
a
m'
commit
|
commitdiff
|
tree
2011-10-18
Ju
n
io C Hamano
M
e
rge
b
r
anch '
t
m/
c
ompletion-commi
t
-fi
x
up-squash'
commit
|
commitdiff
|
tree
2011-10-18
Junio
C
Hamano
Merge branch
'
p
h
/
p
ush-t
o
-
delete-nothi
n
g'
commit
|
commitdiff
|
tree
2011-10-18
Junio C Hamano
Merge
b
ranch 'jc/checko
u
t
-
from-tr
e
e
-keep-loca
l
-c
h
anges'
commit
|
commitdiff
|
tree
2011-10-18
Junio C
H
amano
Merge branch 'js/bisec
t
-no-checkout'
commit
|
commitdiff
|
tree
2011-10-17
J
unio C
H
amano
resolve_gitlink
_
p
acked
_
ref(): fix m
i
smerge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-16
Junio C Haman
o
Update
d
raft
release n
o
tes to 1
.
7
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-16
Junio C Hamano
Merge git:/
/
r
e
po
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2011-10-16
Juni
o
C Hamano
S
y
n
c
wit
h
ma
i
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-16
Junio C Hamano
P
r
epare for 1
.
7
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-16
Jun
i
o C H
a
mano
Merge branch 'ms/patch-id-with-overlong-
l
i
n
e'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-10-16
Ju
n
io C Hamano
M
erge
branch 'jc
/
main
t
-
bund
l
e-t
o
o-qu
i
et' in
t
o m
a
int
commit
|
commitdiff
|
tree
2011-10-16
Junio
C Hamano
Merge b
r
anch '
j
k/filter
-
branch
-
requir
e
-cle
a
n
-w
o
r
k
-tree
.
.
.
commit
|
commitdiff
|
tree
2011-10-16
Junio C Ha
m
an
o
Merge
branch 'jc/ma
i
n
t
-fsck-
f
write-siz
e
-che
c
k
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-10-16
Junio C Haman
o
Merge branch
'
bk/ancestry-
p
ath
'
i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2011-10-16
J
u
nio C
H
a
m
a
no
Merge
b
ran
c
h 'jk/main
t
-
f
e
tch
-
s
ubmodule-check-fi
x
' into
.
.
.
commit
|
commitdiff
|
tree
2011-10-16
Junio C Haman
o
Merge branch 'tr/me
r
getool-valgrind'
i
n
to
m
ai
n
t
commit
|
commitdiff
|
tree
2011-10-16
Jun
i
o C Ha
m
ano
Me
r
g
e
branch 'nm/grep-object
-
sha1-lo
c
k' i
n
to
m
aint
commit
|
commitdiff
|
tree
2011-10-16
Jun
i
o C Ha
m
ano
Merge branch 'jc/diff-index-unpack' into maint
commit
|
commitdiff
|
tree
2011-10-16
Junio C Hamano
Merg
e
branch
'
m
m
/r
e
base-i-exec-edit' into mai
n
t
commit
|
commitdiff
|
tree
2011-10-16
Junio
C
H
a
mano
M
erge
branch '
j
c/grep-untracked-exclude'
commit
|
commitdiff
|
tree
2011-10-16
Junio C Hamano
Merge branch 'jc/maint-grep-untracke
d
-exclud
e
' into
.
.
.
commit
|
commitdiff
|
tree
2011-10-14
Juni
o
C Hamano
Merge branch
'mai
n
t
'
commit
|
commitdiff
|
tree
2011-10-14
Junio
C Hamano
Update dr
a
ft r
e
lease
n
o
t
es to 1
.
7
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-14
Junio C Ham
a
no
M
erge br
a
nch 'js
/
m
a
int-merge-one-file
-
o
s
x-expr'
commit
|
commitdiff
|
tree
2011-10-14
Junio C Hamano
Me
r
ge
b
ra
n
ch 'jn/ident-from-etc-mail
n
ame'
commit
|
commitdiff
|
tree
2011-10-14
J
u
nio C Hamano
M
e
rge branch 'il/arch
i
ve-err-sign
a
l'
commit
|
commitdiff
|
tree
2011-10-14
Juni
o
C
Hamano
Merge
b
ranch 'j
c
/gre
p
-
u
ntracked-
e
xclude'
commit
|
commitdiff
|
tree
2011-10-14
Junio C Hamano
Merge branch 'rs/diff-cleanup-records-fix'
commit
|
commitdiff
|
tree
2011-10-14
Junio C Ha
m
ano
Mer
g
e
b
ranch 'r
s
/pending'
commit
|
commitdiff
|
tree
2011-10-14
Junio C Hamano
M
erg
e
branch 'jn/
n
o
-g-plu
s
-s-on-bsd'
commit
|
commitdiff
|
tree
2011-10-14
Junio C Haman
o
Merge branch 'jc/is-url-simplif
y
'
commit
|
commitdiff
|
tree
2011-10-14
Junio C Hama
n
o
Merge br
a
nch
'nd/g
i
t-dae
m
on
-
e
rror-
m
sgs'
commit
|
commitdiff
|
tree
2011-10-14
Ju
n
io C Hamano
Merge branch 'nd
/
daemon-log-s
o
ck-errors'
commit
|
commitdiff
|
tree
2011-10-14
Junio C Hama
n
o
Merge b
r
anch 'cp/git-web-brow
s
e-browsers'
commit
|
commitdiff
|
tree
2011-10-14
J
u
nio C
Hamano
Merge branch 'jc/
a
p
ply-bl
a
nk-at-eof-fix'
commit
|
commitdiff
|
tree
2011-10-14
Ju
n
io
C Hamano
Merge branch 'd
i
/fast-import-empty-t
a
g-note-
f
ix'
commit
|
commitdiff
|
tree
2011-10-14
Jun
i
o
C
H
aman
o
Merge br
a
nch 'nd/ma
i
nt-a
u
tofix-tag-in-he
a
d
'
commit
|
commitdiff
|
tree
2011-10-14
Junio
C Hamano
Merg
e
branch 'bw/gr
e
p-no-index
-
no-exclude'
commit
|
commitdiff
|
tree
2011-10-14
Ju
n
io C Hamano
Merge branch
'nd/maint-sparse-er
r
o
rs'
commit
|
commitdiff
|
tree
2011-10-12
J
u
nio C H
a
m
a
no
Update draft release
notes to 1
.
7
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-12
Junio
C Ha
m
ano
Mer
g
e bran
c
h 'cb/do-not-pretend-to-hij
a
ck-long-h
e
lp'
commit
|
commitdiff
|
tree
2011-10-12
Junio C Hama
n
o
Merge branch 'sp/smart-http-failure'
commit
|
commitdiff
|
tree
2011-10-12
Junio C Ham
a
no
Merge bran
c
h 'nd/document-err-packet'
commit
|
commitdiff
|
tree
2011-10-12
Junio
C
Hamano
M
erge branch 'jc/pa
r
se-options-boolean'
commit
|
commitdiff
|
tree
2011-10-12
J
u
nio C
H
amano
M
e
rge branch 'rs/test-ctyp
e
'
commit
|
commitdiff
|
tree
2011-10-12
Jun
i
o C Hamano
Merge bran
c
h 'rs/name-r
e
v-usage'
commit
|
commitdiff
|
tree
2011-10-12
J
unio C Hamano
Merge branch 'cs/perl-config-pa
t
h
-
s
e
nd-email'
commit
|
commitdiff
|
tree
2011-10-12
Junio C Haman
o
M
e
rge branch 'z
j
/
send
-
email-authen-sasl'
commit
|
commitdiff
|
tree
2011-10-10
Juni
o
C Hamano
U
pdate dra
f
t
r
e
l
ease notes
t
o
1
.
7
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-10
Junio C Hama
n
o
Merge branch 'dm/tree-wa
l
k'
commit
|
commitdiff
|
tree
2011-10-10
J
unio C Ha
m
ano
Merge bran
c
h
'ps/gitweb-js-with-lineno'
commit
|
commitdiff
|
tree
2011-10-10
Jun
i
o C
H
amano
Merge branch 'mh/maint
-
notes-me
r
ge-p
a
thb
u
f-fix'
commit
|
commitdiff
|
tree
2011-10-10
Junio C Hamano
Mer
g
e branch
'nd/sparse
-
doc'
commit
|
commitdiff
|
tree
2011-10-10
J
u
nio C Hamano
Merge branch 'jp/ge
t
-
r
ef-
d
i
r
-unsorted'
commit
|
commitdiff
|
tree
2011-10-10
Juni
o
C Hamano
Merge
bran
c
h 'mh/che
c
k
-
ref-format-3'
commit
|
commitdiff
|
tree
2011-10-10
Junio
C
Hama
n
o
Merge branch 'mh/iterate-refs'
commit
|
commitdiff
|
tree
2011-10-10
Junio C Hamano
Merge branch 'jm/mergetool-pathspec'
commit
|
commitdiff
|
tree
2011-10-10
Juni
o
C Ham
a
no
Merge branch 'jc/maint-diffs
t
at
-
numst
a
t-
c
o
n
t
ext'
commit
|
commitdiff
|
tree
2011-10-10
Junio C Hama
n
o
Merge
b
ranch 'mz
/
rem
o
te
-
renam
e
'
commit
|
commitdiff
|
tree
2011-10-10
Ju
n
i
o C Hamano
M
erge
b
ra
n
ch 'cb/commo
n
-prefix
-
un
i
fication'
commit
|
commitdiff
|
tree
2011-10-10
J
u
nio C Hamano
Merge br
a
nch '
j
n/maint-http-error-message'
commit
|
commitdiff
|
tree
2011-10-10
Junio C Hamano
Me
r
g
e
b
ranch 'hv/submodule-up
d
ate
-
none'
commit
|
commitdiff
|
tree
2011-10-10
J
u
nio C Hamano
Merge branch 'f
g
/submodule-gi
t
-file
-
git-dir
'
commit
|
commitdiff
|
tree
2011-10-09
Junio C
H
amano
Makefile: fix permissions of merg
e
too
l
s/ checked ou
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next