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
merge-tree: use ll_merge() not xdl_merge()
2010-01-17
Junio C Hama
n
o
me
r
ge-tre
e
:
u
s
e ll_
m
erge() not
xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
Hamano
xdl
_
merge():
allow
pa
s
sing
d
own
m
a
rker
_
size in xmparam_
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
x
d
l
_me
r
ge():
introduce xmparam_t
f
o
r merge specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
git_attr()
:
fix
f
unction signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
J
u
n
i
o
C
H
ama
n
o
rerere forget pat
h
: forget rec
o
rded reso
l
ution
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Hamano
re
r
ere: refactor rerer
e
logic to make it
indepe
n
dent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C
Haman
o
r
er
e
re: remove
s
ill
y
1024
-
by
t
e line li
m
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
J
un
i
o C Hamano
resolve-undo: teach "
u
pd
a
te-index --unresolv
e
"
t
o use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
H
a
mano
resolve-undo: "checkout -m path" uses resolve
-
undo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C
H
a
m
ano
resolve-undo
:
allow plumbing to
c
l
ear the information
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
J
unio C Hama
n
o
resolve-undo: ba
s
ic tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C Ham
a
n
o
r
e
solve-undo: record
resolved
conflicts in
a new
i
ndex
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C Hamano
builtin-
m
e
r
ge
.
c: u
s
e
stand
a
rd a
c
tive_cache macros
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Jun
i
o
C Hamano
Git 1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Juni
o
C Hamano
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-12-20
J
u
nio C Hamano
Git 1
.
6
.
6-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Ha
m
ano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2009-12-16
J
u
n
io C Haman
o
G
i
t
1
.
6
.
6
-
r
c3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
M
erge bran
c
h 'maint' to s
y
nc with
1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Jun
i
o
C Ha
m
ano
G
it 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C
H
amano
worktree:
d
o
n't segfault w
i
th an absolut
e
pathspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio
C Ham
a
no
Upda
t
e
Releas
e
Notes for 1
.
6
.
6 to remove
o
l
d bugfixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Juni
o
C Ha
m
ano
Sync
with 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
io C Hama
n
o
Git 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C
Ha
m
ano
Fix archi
v
e
f
ormat with
-
- on the command line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
io C Hamano
Remove post
-
up
l
oa
d
-
h
ook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hama
n
o
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
.
or
.
c
z
/gi
t
-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio C
H
am
a
no
Mer
g
e
g
it://
g
it
.
k
ernel
.
org/pub/scm
/
git
k
/gitk
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o C Hamano
Update draft release notes to 1
.
6
.
6 before -rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Hamano
Merge branch
'
m
aint'
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Hamano
M
erge branch 'mm/maint-merge-ff-erro
r
-message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Hamano
M
e
r
g
e
b
ranch 'jn/maint-pull-rebase-error-m
e
ss
a
ge' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C
H
a
mano
M
er
g
e branch 'jk/maint-add-p-dele
t
e
-
f
i
x' into
maint
commit
|
commitdiff
|
tree
2009-12-09
Junio
C Hamano
Merge g
i
t://
g
it
.
bogomips
.
org/
g
it-s
v
n
commit
|
commitdiff
|
tree
2009-12-08
Junio C Hamano
R
e
vert
rece
n
t
"git
m
erge <msg> HEAD <commit>
.
.
.
" de
p
recation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hama
n
o
Sync
with 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
G
i
t 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Prepare for 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'uk/maint-shortlog-encoding' into maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merg
e
b
r
anch '
f
c/
m
aint
-
forma
t
-patch-path
s
pe
c
-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C
H
amano
Merge branch 'ap/ma
i
nt-merge-strategy-l
i
st-fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Merge branch '
j
c/maint-am-
k
e
ep' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
man
o
Merg
e
b
r
a
n
ch 'rs/work-
a
round-grep-op
t
-insanity' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge br
a
nch 'rj/maint-cygwin-coun
t
-objects'
i
n
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
mano
Mer
g
e b
r
a
n
ch 'm
m
/mai
n
t-hint-f
a
il
e
d
-mer
g
e' in
t
o
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
M
e
rge branch 'th/maint-remote-update-hel
p
-string' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge branch 'rj/maint-t
9
700
'
into
mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branc
h
'l
s
/m
a
int-mailinfo-no-inbody' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge
b
ranch 'mo/maint
-
crl
f
-doc' i
n
t
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Haman
o
M
erge br
a
nch 'th
/
remot
e
-usage'
into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge bran
c
h 'pb/maint-use-custom-perl' into
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merge bra
n
c
h 'm
m
/confi
g
-pathname-ti
l
d
e
-expand'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
mano
Me
r
ge
b
ran
c
h 'bc/gre
p
-i-F'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'jk/
m
aint-break-rename-reduce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
M
erge branch 'rj/main
t
-simplify-
c
yg
w
in-makefile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C
Hama
n
o
Merge branch 'rg/doc-workflow' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'
n
p/maint-s
i
deband-favor-status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Ha
m
a
n
o
Do
c
ume
n
tati
o
n: xmlto 0
.
0
.
18 does no
t
know --
s
t
r
ingparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge in 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Gi
t
1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Unconditio
n
all
y
set m
a
n
.
base
.
url
.
f
or
.
rel
a
ti
v
e
.
l
in
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge bran
c
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-03
Junio
C H
a
mano
Document
a
tion/Makefile: allow ma
n
.
base
.
url
.
for
.
re
l
at
i
v
e
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Git 1
.
6
.
6-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Mer
g
e br
a
nch '
m
aint
'
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C Ham
a
no
Prepar
e
for 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
J
u
nio C Haman
o
merge: d
o
not ad
d
standard message
w
hen m
e
ssage i
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Haman
o
Do not
misidentify "git
m
e
rge f
o
o HEAD" as an old-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ha
m
ano
Update draft release notes to 1
.
6
.
6 befor
e
-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge branch 'jc/deprecate-old-
s
y
ntax-from-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C
Ha
m
ano
git-
m
erge: a depre
c
ation no
t
ice o
f
the ancient command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C Hamano
Me
r
g
e branch 'bw/remote-get-ref-st
a
tes-fix'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hama
n
o
Me
r
ge b
r
anch
'jn/gitweb-
b
lame'
commit
|
commitdiff
|
tree
2009-11-30
J
unio C Ha
m
ano
Me
r
ge br
a
n
ch
'fc/main
t
-
f
ormat-patch-p
a
thsp
e
c
-dash
e
s'
commit
|
commitdiff
|
tree
2009-11-30
J
un
i
o C Hamano
M
erge branch 'mm/maint-me
r
ge-ff-e
r
r
o
r-message-fix'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C Hamano
M
erge bra
n
ch 'ap/maint-merge
-
s
trategy-list-
f
ix
'
commit
|
commitdiff
|
tree
2009-11-30
J
un
i
o
C Hamano
Me
r
ge b
r
a
nch 'jc/pretty-lf'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Mer
g
e branch
'cc/bi
s
ect-doc'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
i
o
C Ham
a
no
Merge branch
'
e
m
/co
m
m
i
t-claim'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
aman
o
Merge
bran
c
h 'jc/
m
ai
l
in
f
o-re
m
ove-
b
r
a
ckets'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C Hamano
M
e
r
ge branch 'fc/send-email-envelope'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
Hamano
Merge branch '
u
k/maint-shortlog-e
n
coding'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ha
m
ano
M
e
rge branch
'
n
s
/send-
e
m
ail-no-chain-reply-to'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C Ha
m
ano
Merge bran
c
h 'jc/maint-am-keep'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C Hamano
Me
r
ge branch 'bw/diff-color
-
hunk-header'
commit
|
commitdiff
|
tree
2009-11-28
Junio C
H
amano
Updat
e
draft re
l
ease notes to 1
.
6
.
6 before merging
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Junio C Hamano
em
i
t_line(): don't em
i
t an empty <SE
T
><RESET> followed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C H
a
mano
Remove dead
c
od
e
f
r
o
m "git am
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio
C
Ham
a
no
Merge branch
'
maint
'
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
builtin-
a
pply
.
c
:
pay a
t
t
e
ntion to -
p
<n>
w
hen de
t
ermining
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
J
unio C Ham
a
no
Merge branch 'rs/work-around-grep-opt-insanity'
commit
|
commitdiff
|
tree
2009-11-24
Juni
o
C Ha
m
ano
Merge branch 'rj/maint-cygwi
n
-count-objects'
commit
|
commitdiff
|
tree
2009-11-24
Junio
C Hamano
Mer
g
e branch 'rs
/
co
l
or-escape-h
a
s-zero-width'
commit
|
commitdiff
|
tree
2009-11-24
Junio
C Hamano
Merge branch
'
bg/appl
y
-doc'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Ham
a
no
Me
r
g
e branch 'm
m
/main
t
-
hint-f
a
iled
-
merge'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hama
n
o
Merge
b
ranch 'jc/log-std
i
n'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hama
n
o
M
erg
e
branch 'mr/g
i
tweb-snapsho
t
'
commit
|
commitdiff
|
tree
next