repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
resolve-undo: "checkout -m path" uses resolve-undo information
2009-12-26
Junio C Hama
n
o
re
s
olve
-
undo: "
c
heckout -m path" uses reso
l
ve-und
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C H
a
mano
r
e
s
olve-undo: all
o
w
p
lumbing to clear the inf
o
rmation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
J
u
nio C Hamano
re
s
olve-undo: basic
tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C H
a
ma
n
o
resolve-
u
ndo: record
r
e
solved c
o
nflic
t
s in a new index
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C H
a
mano
builtin-merg
e
.
c
:
use st
a
n
d
ard active_c
a
che macros
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-23
Junio
C
Hamano
Git 1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
Ju
n
i
o
C Ha
m
ano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2009-12-20
J
unio C Hamano
Git 1
.
6
.
6-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-16
Jun
i
o C Ham
a
no
Gi
t
1
.
6
.
6-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hama
n
o
Merg
e
branc
h
'maint' to sy
n
c with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio C
Hama
n
o
Git 1
.
6
.
5
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
wo
r
ktree: don't segfa
u
lt wit
h
a
n
absolut
e
pathsp
e
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Juni
o
C
H
a
ma
n
o
U
pdate R
e
leas
e
N
o
tes
for
1
.
6
.
6
to remove
old bugfixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
Sync wi
t
h 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C H
a
mano
Git 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Fix
a
rc
h
ive f
o
rm
a
t
w
ith
-
-
on the comman
d
li
n
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C Hamano
Remove post-upl
o
ad-
h
o
o
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Jun
i
o
C
Hamano
Git 1
.
6
.
6-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge git://repo
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio
C Hamano
Merge gi
t
://git
.
ker
n
el
.
org/p
u
b/scm/gitk/gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio C
H
a
mano
Upd
a
t
e
d
raft releas
e
notes to 1
.
6
.
6 be
f
ore
-
r
c2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge branch
'm
a
in
t
'
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
m
a
no
Merge
branch 'mm/maint-m
e
rge-ff-e
r
r
o
r-me
s
sage-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o
C
H
a
ma
n
o
Merge bran
c
h 'j
n
/mai
n
t-pull-rebase-error-mes
s
age' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Me
r
g
e
bra
n
ch 'jk
/
m
a
int-add-
p
-de
l
e
t
e-fix' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hama
n
o
Merge git:/
/
git
.
bogomips
.
or
g
/
g
i
t-svn
commit
|
commitdiff
|
tree
2009-12-08
J
unio C Hamano
Revert recent "gi
t
merge <msg> H
E
AD <
c
ommit>
.
.
.
" depreca
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Ha
m
ano
S
ync with
1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Git 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'm
a
int
'
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C
Ha
m
ano
Pre
p
ar
e
f
o
r 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
erge branch 'uk/ma
i
nt-short
l
og-
e
ncoding' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merge bran
c
h
'fc/ma
i
nt-f
o
rmat
-
p
a
tch-pathspec-da
s
hes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Merg
e
b
r
anch 'ap/maint-merge-strategy-list-fix' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merg
e
branch 'jc/mai
n
t
-
am
-
kee
p
' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
mano
Merge branch 'rs/work-a
r
ound-grep-
o
pt-insanity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'rj/maint-cygw
i
n-count-objec
t
s' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hama
n
o
M
erge br
a
nch 'mm/m
a
int-hint-
f
ailed-me
r
ge' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'th/maint-remote-updat
e
-help-string' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e br
a
nch
'
rj
/
maint-t9700' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
m
ano
M
erge branch '
l
s/maint-
m
ailinfo-no-inbody
'
into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
aman
o
Merge branch 'mo/mai
n
t-cr
l
f-doc' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hama
n
o
M
e
rg
e
branch '
t
h/remote-usage
'
into
m
a
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Ha
m
ano
M
erge
b
ranch 'pb/maint-
u
se-cu
s
tom-perl' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
branch 'mm/c
o
nfig-pat
h
n
a
me-
t
ilde-expan
d
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Ha
m
ano
Merge branch 'bc/grep-i-
F
'
into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
H
a
m
ano
M
e
rg
e
branch 'jk/maint-b
r
ea
k
-
renam
e
-reduce-memo
r
y'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
M
e
rg
e
branch 'rj/maint-simplify-cy
g
wi
n
-makefile'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge branch 'rg/doc-workflow' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Merge branch '
n
p
/maint-si
d
eband-favor-s
t
atus' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
D
o
cume
n
ta
t
ion: xmlto
0
.
0
.
18
d
o
e
s n
o
t kno
w
--stringparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C Hamano
Mer
g
e
in
1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Git 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Uncond
i
tionally set m
a
n
.
base
.
u
r
l
.
for
.
r
elative
.
l
i
nks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io C Ha
m
a
no
Git
1
.
6
.
6-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ha
m
ano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2009-12-02
J
u
nio
C
Hamano
Prepare fo
r
1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C
Hamano
merge: do not add standard message when mes
s
age i
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C Hamano
Do not
m
i
side
n
tify "git merge foo HEAD" as an o
l
d
-
st
y
le
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Updat
e
draft release
n
otes to
1
.
6
.
6
b
efore -rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hama
n
o
Merge branc
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-01
J
u
n
io C Hamano
Merg
e
bran
c
h 'jc
/
depre
c
a
t
e
-old-synt
a
x-from-merge
'
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o C
Hamano
g
i
t-merge: a deprecat
i
o
n
notice of th
e
a
nci
e
nt c
o
mma
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio C Ha
m
a
no
Merge branch 'bw/r
e
mote-get-ref-states-fix'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hama
n
o
Merg
e
bra
n
ch 'jn/git
w
eb-blame'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch '
f
c/maint-form
a
t-
p
atch-pathspec-dashes'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hama
n
o
Merge bran
c
h 'mm/maint-me
r
ge-ff-error-message-fix
'
commit
|
commitdiff
|
tree
2009-11-30
J
u
ni
o
C
H
a
m
a
no
Merge branch 'ap/ma
i
n
t-mer
g
e-strategy-
l
ist-
f
ix'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
i
o
C Hamano
Merge branch 'jc/
p
retty-lf'
commit
|
commitdiff
|
tree
2009-11-30
J
u
n
i
o
C Hamano
Merge
b
ranch 'cc
/
bisect-doc
'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C Hamano
Me
r
g
e branch 'em/commi
t
-claim'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C Hamano
Me
r
ge
b
ranch 'jc/mailinfo
-
remove-bra
c
k
et
s
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hama
n
o
Merge branch 'fc/
s
e
nd-email-envelope'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C Haman
o
Merge bran
c
h
'u
k
/m
a
i
nt-shor
t
log-encod
i
ng'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
Hama
n
o
M
erge b
r
anch 'n
s
/s
e
nd-email
-
no-
c
hain-reply-
t
o'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C Hamano
M
e
r
ge bra
n
c
h 'jc/maint-am-ke
e
p'
commit
|
commitdiff
|
tree
2009-11-30
J
uni
o
C Hamano
Me
r
ge branch 'bw/diff-co
l
or-hunk-header'
commit
|
commitdiff
|
tree
2009-11-28
Junio C
H
a
m
ano
Up
d
ate
dr
a
ft r
e
lease not
e
s t
o
1
.
6
.
6 before
merging
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Ju
n
io C Hamano
emit_line():
d
on
'
t
e
mit an em
p
ty <SET><RESET> followed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Ju
n
io C Haman
o
R
emove dead c
o
d
e
f
rom
"
g
it am"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
J
u
nio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-11-27
Junio C Ham
a
no
builtin-a
p
ply
.
c: pay atten
t
ion t
o
-p<n> when determining
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Junio C
H
a
mano
Merge br
a
nc
h
'
r
s
/
work-around-grep-opt-insanity'
commit
|
commitdiff
|
tree
2009-11-24
Junio C H
a
mano
Merge
branch 'rj/m
a
int-cy
g
win-co
u
n
t-object
s
'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
M
erge branch 'rs/c
o
lor-escape-has-
z
ero-
w
idth'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge branch 'bg
/
apply-doc'
commit
|
commitdiff
|
tree
2009-11-24
J
u
nio C Hamano
Merge branch 'mm/main
t
-hin
t
-failed-merg
e
'
commit
|
commitdiff
|
tree
2009-11-24
Junio C H
a
mano
M
e
rge
bra
n
ch 'jc/l
o
g-stdin'
commit
|
commitdiff
|
tree
2009-11-24
J
unio C Hamano
M
e
rg
e
b
r
a
nch
'mr/git
w
eb-snapshot'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hama
n
o
Merge b
r
an
c
h 'cc/
r
eplace
'
commit
|
commitdiff
|
tree
2009-11-24
J
u
nio
C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Protect
s
crip
t
ed Po
r
celains from
G
R
EP_OPTIONS i
n
sanity
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
J
u
n
i
o C
H
amano
A
d
d
t
rivial tes
t
s
for --stdin option to
lo
g
fami
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
J
u
nio C Ha
m
ano
Me
r
g
e
branch 'bg/f
e
tch-m
u
lti'
commit
|
commitdiff
|
tree
2009-11-23
J
unio
C
H
a
mano
Git
v
1
.
6
.
6-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Merge b
r
an
c
h
'maint'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Merge gi
t
://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-11-23
Jun
i
o
C
H
amano
Merg
e
branch 'th
/
m
a
int
-
remote-update-help-strin
g
'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Merg
e
b
r
anch 'jn/faster-complet
i
on-star
t
up'
commit
|
commitdiff
|
tree
next