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: allow plumbing to clear the information
2009-12-26
Junio C Hamano
res
o
lve-
u
ndo:
a
llow plumbing t
o
c
lear t
h
e inform
a
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
J
u
n
i
o C H
a
m
a
no
resolve-u
n
d
o: basic tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ha
m
ano
resolve-undo:
r
e
cord
resolved
c
o
n
flicts
in a new in
d
ex
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
b
uilt
i
n-merge
.
c
:
use standard active_cache
m
acros
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
Junio
C
H
amano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-20
Junio C Ham
a
no
G
i
t
1
.
6
.
6-rc
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio C
Ha
m
ano
M
e
rge branch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
G
i
t 1
.
6
.
6-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
J
u
nio
C Ha
m
an
o
Merge bran
c
h 'maint'
to sync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Git
1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
J
unio C Hamano
w
o
rktree:
don'
t
s
e
g
f
au
l
t
with an absolu
t
e pathspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C
H
amano
Update Release
N
ot
e
s for
1
.
6
.
6 to rem
o
ve old bugfixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio
C
Ham
a
n
o
S
yn
c
with 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
unio C
Ham
a
no
Git 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C
H
amano
Fix archive format with -- on the
c
ommand line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Haman
o
Remove
p
ost-u
p
load-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
G
it 1
.
6
.
6-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Hamano
M
e
rge
git://r
e
po
.
or
.
cz/gi
t
-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio C
H
amano
Merg
e
git://g
i
t
.
kernel
.
org/pub/scm/gi
t
k/gitk
commit
|
commitdiff
|
tree
2009-12-09
J
unio C
Ham
a
no
Update draft release
notes t
o
1
.
6
.
6 before -
r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ham
a
no
Me
r
ge branch
'
maint'
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C Hamano
M
erge branc
h
'mm/maint-merg
e
-ff-error-messa
g
e-fix
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merg
e
branch 'jn/mai
n
t-p
u
l
l-rebase-error-message' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Me
r
g
e
branch 'jk/maint
-
a
d
d-p-delete-f
i
x' int
o
maint
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
M
erg
e
g
i
t:/
/
git
.
bogomi
p
s
.
or
g
/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio
C
Hamano
Revert rec
e
nt "git
m
e
r
g
e <msg> HEAD <commit>
.
.
.
"
d
e
p
recat
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Sync with 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
J
unio C Ha
m
ano
Git 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Pre
p
are 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
Merge branc
h
'u
k
/ma
i
nt-shortlog-encoding' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
i
o
C Ham
a
no
M
e
rge branc
h
'fc/maint-
f
ormat-patch
-
pathspec-dashe
s
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e branc
h
'ap/
m
aint
-
merge-
s
trategy-list-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge branch '
j
c/maint
-
am-keep' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge branch 'rs/work-
a
round-gr
e
p-opt-i
n
sanity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Ha
m
ano
Mer
g
e
br
a
nch 'rj/maint-cygwin-count
-
objects' int
o
m
a
int
commit
|
commitdiff
|
tree
2009-12-03
J
u
ni
o
C Haman
o
Merg
e
branch 'mm/maint-hint-
f
ailed-merge' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge branch 'th/main
t
-
re
m
ote-update-help-string'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
i
o C Hamano
Merge branch 'rj/maint-t9700' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
g
e branch 'ls/m
a
int
-
mailinfo
-
no-inbody'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Ha
m
a
no
Merge bran
c
h 'mo
/
maint-c
r
lf-doc' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
J
u
ni
o
C
Hamano
Merge branch '
t
h/remote-us
a
ge' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
ni
o
C
H
amano
Merg
e
branch '
p
b/m
a
i
nt-use-cust
o
m-perl' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branc
h
'mm/config-path
n
ame-tild
e
-expa
n
d' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ha
m
ano
Merge branch '
b
c/grep-i-F'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Me
r
g
e
b
ranch
'
jk
/
maint-bre
a
k
-ren
a
me-r
e
duc
e
-me
m
ory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Haman
o
Me
r
ge branch 'rj/maint-
s
i
m
p
l
ify-c
y
gwin-makefil
e
' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Haman
o
M
erge branc
h
'rg/doc-workflow' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge
branch 'np/maint-side
b
and
-
favor-status
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Docum
e
ntation: xmlto 0
.
0
.
18
d
o
e
s not know --stringpar
a
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Ham
a
no
M
erge in 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C Hamano
Git 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Ha
m
ano
Uncond
i
tionally set man
.
base
.
url
.
f
o
r
.
r
elative
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
m
ano
Documentat
i
on/
M
akefile: allow man
.
base
.
url
.
for
.
relat
i
ve
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hama
n
o
Gi
t
1
.
6
.
6-
r
c1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
J
un
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Jun
i
o C Ha
m
ano
Prepare for 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
m
e
rge:
d
o
not ad
d
standard message when message is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
H
a
m
an
o
Do not
misidentify "git
m
er
g
e foo
H
E
AD" as an old-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
U
pdat
e
draft
releas
e
notes t
o
1
.
6
.
6
b
e
f
ore -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge b
r
anch
'maint'
commit
|
commitdiff
|
tree
2009-12-01
J
u
n
i
o C Ham
a
n
o
M
e
rge br
a
nc
h
'jc/depre
c
ate-old-syntax-fr
o
m-m
e
rge'
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
i
o C H
a
mano
git-merg
e
: a deprecation notice of
t
h
e ancient command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
i
o
C
Hamano
Merge b
r
anch
'
bw/r
e
mote-get-ref-s
t
ates-fi
x
'
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio C Haman
o
M
erge branch 'jn/gitweb-blame'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
Ham
a
no
M
e
rge b
r
anch 'fc/maint-format-patch-pathspec
-
dashes'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ha
m
ano
Merg
e
br
a
nch
'
mm
/
m
ai
n
t-merge-ff-error-me
s
sage-fix'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C Hama
n
o
Merge branch 'ap/maint-merge-stra
t
egy-list-f
i
x'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch
'
jc/
p
retty-lf'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C Hamano
M
e
r
g
e
branch 'cc/bisect-do
c
'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io
C
Hama
n
o
M
e
r
ge b
r
anch
'
em/commit-claim'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Haman
o
M
e
rge branch 'jc/mailinf
o
-remov
e
-brackets
'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C Hamano
Merge b
r
anch 'fc
/
send
-
ema
i
l
-
envelope'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge
branch 'uk/maint-shortlog-encoding'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
Hamano
Merge bran
c
h
'ns/
s
end
-
email-no-chai
n
-reply-t
o
'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C Haman
o
Merge bra
n
c
h 'jc/m
a
int-am-
k
eep
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
Hama
n
o
Merge bra
n
ch 'bw
/
di
f
f
-
color-hunk-h
e
ader'
commit
|
commitdiff
|
tree
2009-11-28
Junio C Hamano
Update dra
f
t relea
s
e notes to 1
.
6
.
6 before mer
g
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Ju
n
i
o
C
H
amano
e
mit
_
line():
d
on't em
i
t an
empty
<
SET><RESET> followe
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Ju
n
io C
H
amano
Remove
dead code
f
rom "git am"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
J
u
nio C Haman
o
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-11-27
Ju
n
io C Hamano
builtin-apply
.
c: pay attentio
n
to -p<n> when determini
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Juni
o
C Ha
m
ano
Me
r
ge branch 'r
s
/work-a
r
ound-g
r
ep-opt-insan
i
t
y'
commit
|
commitdiff
|
tree
2009-11-24
Jun
i
o C Hamano
Merge
branch 'rj/maint
-
cygwin-count-ob
j
ects
'
commit
|
commitdiff
|
tree
2009-11-24
Junio
C
Hamano
Merge branch 'rs/color-esca
p
e-has-z
e
ro-w
i
dth'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hama
n
o
Merge branch '
b
g/apply-doc'
commit
|
commitdiff
|
tree
2009-11-24
Junio C
Hamano
Merge branch
'mm/m
a
in
t
-hint-failed-merg
e
'
commit
|
commitdiff
|
tree
2009-11-24
Jun
i
o C Hama
n
o
Me
r
g
e br
a
n
c
h
'j
c
/
l
og-stdin'
commit
|
commitdiff
|
tree
2009-11-24
Junio C H
a
ma
n
o
Merge bra
n
c
h
'
m
r/gitweb-sna
p
shot'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge br
a
n
ch 'cc/rep
l
ace'
commit
|
commitdiff
|
tree
2009-11-24
Junio C
Hamano
Me
r
ge br
a
nch 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2009-11-24
J
unio C Haman
o
P
rotec
t
scripted Porcelains from GREP
_
OPT
I
ONS insanity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Junio C
H
aman
o
Add tr
i
vial tests for --stdi
n
o
p
tion to log family
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Junio C H
a
m
ano
M
e
rge branch 'bg/fetch-mult
i
'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hama
n
o
Git v1
.
6
.
6-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Juni
o
C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Ham
a
no
Merge
g
it
:
//git
.
bogomips
.
org/g
i
t-svn
commit
|
commitdiff
|
tree
2009-11-23
Jun
i
o C Hamano
Merge branch 't
h
/maint-remo
t
e-
u
pdate-help
-
stri
n
g'
commit
|
commitdiff
|
tree
next