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
xdl_merge(): allow passing down marker_size in xmparam_t
2010-01-17
Junio C
Hamano
x
d
l_me
r
ge():
allow passing d
o
wn marker
_
s
i
ze in xm
p
aram_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
xdl_merge(): introd
u
c
e
xmparam_t for merge
s
pec
i
f
i
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Haman
o
g
it_
a
ttr(): fix function si
g
natu
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
J
u
nio
C Haman
o
rerere forget path: forget recorde
d
resolution
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Ha
m
ano
rer
e
re: refactor rerere logic t
o
ma
k
e it
i
ndepend
e
nt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Ju
n
io C Hamano
re
r
ere: remo
v
e silly 1024
-
byte line
lim
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
resolve-u
n
do: t
e
ach "update
-
ind
e
x --u
n
resolve" to
u
se
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
J
u
nio C Hama
n
o
resolv
e
-undo
:
"check
o
ut
-
m path" uses resol
v
e-undo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ha
m
ano
res
o
lve-u
n
do: all
o
w plumbing to clear th
e
information
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C
Hamano
resolve-un
d
o:
basic tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
J
un
i
o C H
a
m
ano
res
o
lve-und
o
:
record r
e
sol
v
e
d
c
o
nflicts in a new index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C
Hamano
builtin-
m
erge
.
c: u
s
e stand
a
r
d
acti
v
e_c
a
c
h
e macros
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Junio
C
Ha
m
ano
G
it 1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Hamano
Merg
e
b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2009-12-20
Junio
C
Ha
m
ano
Git 1
.
6
.
6-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio
C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-16
Junio C H
a
mano
Git
1
.
6
.
6-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
J
u
nio C Haman
o
Merge
b
r
anch '
m
aint' to sync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Ju
n
io C
H
amano
Git 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Juni
o
C
H
a
mano
w
orktree
:
don't segfault with an absolut
e
p
a
thspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio
C
H
a
mano
Update Release
N
otes
f
or 1
.
6
.
6 to
r
e
m
ove old bugfixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
Sync with 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C
Hamano
Git 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hama
n
o
Fix archive fo
r
mat with --
on the comma
n
d line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C H
a
mano
Remove post-upload-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C
H
amano
Git 1
.
6
.
6-
r
c2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
J
u
n
io
C
Hamano
Merge git://repo
.
or
.
cz
/
g
it-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merg
e
git
:
//git
.
kernel
.
org/pub
/
s
c
m/gi
t
k/gi
t
k
commit
|
commitdiff
|
tree
2009-12-09
Junio C
Hamano
U
p
date dra
f
t
release notes
t
o
1
.
6
.
6 be
f
ore -
r
c2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C Hamano
Merg
e
branch
'
maint'
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C
Hamano
Merg
e
branc
h
'mm/
m
aint-merge-ff-error-message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C
H
amano
Merge branch 'jn/maint
-
pull-
r
eb
a
se-error-message
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C
Hamano
Merge
branch 'jk/maint-add-p-delete
-
fix' int
o
maint
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge git://
g
it
.
bogo
m
i
ps
.
o
rg/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C Hamano
Revert recent "gi
t
merg
e
<msg> HEAD <commit
>
.
.
.
"
deprecation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Ju
n
io C
H
amano
Syn
c
wit
h
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hama
n
o
Git 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merg
e
branch 'm
a
int'
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C H
a
ma
n
o
P
r
epare for 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge branch
'
u
k/maint
-
shortlog
-
encodin
g
' into
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
a
no
Merge branch
'
f
c/maint-form
a
t
-patc
h
-pathsp
e
c-dash
e
s
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge bran
c
h
'
ap/maint-merge-s
t
rategy-
l
ist-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C Hamano
Merge
branch 'jc/maint-am-keep' into
m
ai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge
b
ranc
h
'rs/work-around-g
r
ep
-
opt-insan
i
ty' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'rj/maint-cygw
i
n-c
o
unt-objects
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
ni
o
C Haman
o
Merge bra
n
ch 'mm/mai
n
t-hi
n
t-failed-merg
e
' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Merge bran
c
h 'th/maint-remote
-
u
pdate-help
-
stri
n
g' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hama
n
o
Merg
e
branch '
r
j
/maint
-
t9700' i
n
to
m
a
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
am
a
no
Mer
g
e branc
h
'ls/maint-mailinfo-no
-
inbody' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Ha
m
ano
Merge branch '
m
o/
m
aint-c
r
lf-doc' into
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'th/rem
o
t
e
-usage' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
mano
Merge
b
r
anch '
p
b/maint
-
use-custom-perl'
into main
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C H
a
mano
Mer
g
e
br
a
nc
h
'mm
/
config
-
pathname-tilde-
e
xpand' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
a
mano
Me
r
ge branch 'bc/g
r
ep-i-
F
' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
i
o
C Hamano
Merge branch 'jk/mai
n
t-
b
reak-rename-reduce
-
memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Merge bran
c
h
'rj/maint
-
simplify-c
y
gwin-makefile'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge branch
'
rg/doc-workflow' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
M
e
rge bran
c
h '
n
p/maint-sideband-favo
r
-status' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Documentation
:
xml
t
o 0
.
0
.
18 does not
k
now --s
t
ringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Me
r
ge in
1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C
H
amano
Git 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
U
n
conditionally set man
.
base
.
url
.
fo
r
.
relative
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merg
e
bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Documentation/Makefile:
a
l
l
o
w man
.
b
ase
.
url
.
f
o
r
.
relative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
Hama
n
o
G
i
t 1
.
6
.
6-r
c
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
P
repare
for 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
H
a
mano
merge: do not add standard
message when message
is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
Hamano
Do not m
i
s
i
dentify "gi
t
merge foo
HEAD
"
as
a
n old-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C
H
amano
U
p
date draft release not
e
s to 1
.
6
.
6 before
-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
J
unio C H
a
mano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ham
a
no
Merge branch 'jc/de
p
recat
e
-old-syntax-from-merge
'
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio
C
Hamano
git-merg
e
: a
d
epreca
t
ion no
t
i
c
e
of the an
c
ient
c
ommand
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hama
n
o
Merge branch 'bw/re
m
ote-get-ref-s
t
ates-fix'
commit
|
commitdiff
|
tree
2009-12-01
Junio C H
a
m
a
n
o
Merge branch 'jn/gi
t
web-blame'
commit
|
commitdiff
|
tree
2009-11-30
J
u
n
i
o C
Ha
m
an
o
M
e
r
g
e bra
n
c
h
'fc/maint-format-patch
-
p
athspe
c
-dash
e
s'
commit
|
commitdiff
|
tree
2009-11-30
J
unio C Haman
o
M
e
rg
e
bran
c
h 'mm/ma
i
nt-merge-ff-error
-
m
e
s
sage-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
mano
Merge branch 'ap/mai
n
t-merge
-
strat
e
g
y-list-f
i
x'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
a
ma
n
o
Merge branch 'jc/pretty-lf'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C
H
ama
n
o
M
e
rge b
r
anch
'cc/bisect-d
o
c'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C Hamano
Merge branc
h
'em
/
commit-cl
a
im'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ha
m
an
o
Merge branch 'j
c
/mailinfo
-
remove-bra
c
ke
t
s'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C
H
a
m
ano
Mer
g
e
b
r
anch
'f
c
/send-email-env
e
lope'
commit
|
commitdiff
|
tree
2009-11-30
J
unio C H
a
mano
Merge branch 'u
k
/ma
i
nt-shortlog
-
e
ncoding'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C Hamano
Merge branch 'ns
/
send-em
a
i
l-no-c
h
ain-reply-to'
commit
|
commitdiff
|
tree
2009-11-30
J
unio C
H
ama
n
o
Merge branch 'jc/maint-am-keep'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C Hamano
Mer
g
e branc
h
'bw/diff-
c
olor-hunk-hea
d
er'
commit
|
commitdiff
|
tree
2009-11-28
Junio
C Hamano
Update
d
raft rele
a
se 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
e
mit_line(): don
'
t emi
t
an emp
t
y
<
SE
T
><RESET
>
fol
l
o
w
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Juni
o
C Hamano
Re
m
ove de
a
d co
d
e f
r
om "
g
it am"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio
C Hamano
M
erge
branch 'maint'
commit
|
commitdiff
|
tree
2009-11-27
Junio C H
a
mano
builtin-apply
.
c
:
pay a
t
tention to -p<n> when de
t
erminin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Junio
C
Hama
n
o
Merge bra
n
ch 'r
s
/work
-
around-grep-o
p
t-in
s
a
nity'
commit
|
commitdiff
|
tree
2009-11-24
Junio
C
Haman
o
M
e
rge bran
c
h 'rj/maint-cygwin-count-o
b
jects'
commit
|
commitdiff
|
tree
2009-11-24
Junio
C Hama
n
o
Merge bran
c
h '
r
s/color-e
s
cap
e
-ha
s
-zero-
w
i
dth'
commit
|
commitdiff
|
tree
2009-11-24
Junio C
H
amano
Merge branch 'bg
/
apply-doc'
commit
|
commitdiff
|
tree
2009-11-24
J
u
n
io C Hamano
Me
r
g
e branch
'mm/mai
n
t-hi
n
t-failed-merg
e
'
commit
|
commitdiff
|
tree
2009-11-24
Jun
i
o
C
H
a
mano
Merge
b
ranch
'
jc/lo
g
-stdin'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge branch
'mr/git
w
eb-s
n
apshot'
commit
|
commitdiff
|
tree
2009-11-24
Jun
i
o C Hamano
Merge bran
c
h
'
c
c
/
replac
e
'
commit
|
commitdiff
|
tree
next