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(): introduce xmparam_t for merge specific parameters
2010-01-17
Juni
o
C
H
am
a
no
xdl_merg
e
(): introduce xmpara
m
_t
for merg
e
specifi
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
H
amano
git_attr(
)
: fix
f
unction signature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Junio C H
a
m
ano
rerere f
o
rget path: for
g
et recorded resolution
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Juni
o
C Hamano
rere
r
e:
r
e
f
actor rerere logic to
m
ake it
i
ndependent
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o
C
H
am
a
n
o
r
e
rere:
r
emove si
l
ly 1024-byt
e
line limit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o
C H
a
ma
n
o
resolve-undo:
t
each "up
d
ate-index --unresol
v
e" to use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hama
n
o
resolve-undo: "checkout -m p
a
th"
uses resolv
e
-undo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
Hamano
re
s
olve-undo: allow pl
u
m
b
ing to clear the inf
o
r
m
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
J
unio C Ham
a
no
resolve-u
n
do: basic tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
J
u
n
io C Hamano
reso
l
v
e
-
u
ndo: record resolved conf
l
i
c
ts
i
n a new index
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Ju
n
io C Haman
o
builtin
-
merge
.
c: use
stan
d
ard act
i
ve_cac
h
e mac
r
os
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-23
J
u
nio C Hamano
Git
1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Hamano
M
e
rge branch 'maint
'
commit
|
commitdiff
|
tree
2009-12-20
Junio 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
Junio C
H
aman
o
Git 1
.
6
.
6-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C H
a
mano
Merge bran
c
h 'maint' to sync with
1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
J
unio C H
a
ma
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
worktree: don't segf
a
ult
with an absolute pat
h
spec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
J
u
nio C Hamano
Update Release Note
s
for 1
.
6
.
6
to remove old bugfixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Ju
n
io 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
Ju
n
io C Hamano
Git
1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio C Ham
a
no
Fix archi
v
e
f
ormat w
i
th -- on t
h
e comma
n
d
line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Remo
v
e
post-upload-ho
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
Ha
m
ano
Merg
e
git://repo
.
or
.
cz/
g
it-gui
commit
|
commitdiff
|
tree
2009-12-09
J
u
n
io C Hamano
Merge git://git
.
k
e
r
nel
.
org/pub/s
c
m/gitk/gi
t
k
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
U
p
date draft rel
e
ase notes to 1
.
6
.
6 before -rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o C H
a
mano
Merge
b
r
anch
'
m
aint'
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o C
Hamano
Merge branch 'mm/m
a
i
nt-merge-ff-err
o
r-
m
e
s
sage-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge branch 'jn/maint-p
u
ll-rebase-error-
m
e
ssage' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C
H
amano
Me
r
g
e branch 'jk/mai
n
t-a
d
d-p-del
e
t
e
-fix' into m
a
int
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
M
erge git
:
//git
.
bogomips
.
org/git-sv
n
commit
|
commitdiff
|
tree
2009-12-08
Junio C
H
a
mano
Reve
r
t rec
e
n
t "git m
e
rge <msg> HEA
D
<
commit>
.
.
.
" deprecation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio
C
Ha
m
a
no
Sync
w
ith
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
Merg
e
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Pre
p
a
r
e 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 'uk/maint-shortlog-e
n
codin
g
'
into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C
H
amano
Mer
g
e bra
n
c
h
'
f
c/maint
-
for
m
a
t-
p
atc
h
-pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge branc
h
'
a
p
/ma
i
nt-merge-strategy
-
list-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'jc/maint-am-keep' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Mer
g
e
branch 'rs/work-arou
n
d-grep-opt-insanity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch '
r
j
/
m
a
int-cy
g
win-cou
n
t-
o
bjects'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hama
n
o
Merge branch 'mm/maint-h
i
nt-failed-mer
g
e'
in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Haman
o
Merge bra
n
ch 'th/maint-remote-update-he
l
p-string' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Mer
g
e
b
ran
c
h 'rj
/
main
t
-t9700'
into
main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e branch 'ls/maint-mailinfo-no-i
n
body' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge bran
c
h 'mo/mai
n
t-crlf-doc' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge bra
n
ch 'th/r
e
mot
e
-usage' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
ma
n
o
Merge br
a
nc
h
'pb/maint-use-custom-perl' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Haman
o
Merge branch 'm
m
/config
-
pa
t
h
n
ame-tilde-
e
xpa
n
d
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge b
r
anch 'b
c
/grep-i-F' into maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C H
a
mano
Merge b
r
a
nch 'jk/maint-break-rename-reduce-m
e
mory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
M
e
r
ge branch
'
r
j/maint-simp
l
if
y
-cygwin
-
makefile'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge branch 'rg/doc-workf
l
ow' into ma
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
branch 'np/maint-
s
ideban
d
-favor-status' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Documentation:
x
m
l
to 0
.
0
.
18 does no
t
know
-
-stringparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merge in 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Git 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
i
o C Hamano
Uncon
d
itionally set man
.
base
.
url
.
for
.
relativ
e
.
l
inks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C H
a
mano
G
i
t 1
.
6
.
6-
r
c1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Jun
i
o C Hamano
Merge
b
r
anch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hama
n
o
Prep
a
re
for 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
u
n
i
o C Hama
n
o
merge: do not add sta
n
d
a
rd
m
essage
w
h
e
n
mes
s
age i
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Do not m
i
s
i
d
e
n
t
ify "git merge foo HEAD" a
s
an ol
d
-sty
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C
H
a
m
ano
Upda
t
e
draft re
l
e
as
e
notes to
1
.
6
.
6
b
e
f
o
r
e -rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C
H
amano
Merge br
a
nch
'
maint
'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merg
e
branch 'j
c
/deprecate-old-syntax-from-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
gi
t
-
merge: a deprecation
notice of the ancient command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C Hamano
Merge
branc
h
'bw/
r
emote-get-ref-states-fix'
commit
|
commitdiff
|
tree
2009-12-01
J
unio C Hamano
Me
r
ge bra
n
c
h
'jn
/
gitweb-blame
'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
Hamano
Merge branch 'fc/
m
aint
-
fo
r
mat-p
a
tch-p
a
th
s
pec-dashes'
commit
|
commitdiff
|
tree
2009-11-30
J
unio C Ha
m
ano
Merge branch '
m
m/mai
n
t-merge-ff
-
error-messag
e
-
f
ix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
amano
Mer
g
e branch
'
ap/mai
n
t-me
r
ge-strategy-list-fix'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio
C
H
a
man
o
Merge branch 'jc/pretty-lf'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'cc/bisect-doc'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
Ha
m
ano
M
erge
b
ranch 'em/commit-cl
a
im'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C Hamano
Merge branch 'jc/mailinfo-rem
o
v
e
-brackets'
commit
|
commitdiff
|
tree
2009-11-30
J
u
ni
o
C Hamano
M
erge branch 'fc/send-email-envelope'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C Hamano
Merge branc
h
'uk/mai
n
t-shortlo
g
-encodi
n
g'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C Hamano
Merge branch 'ns/send
-
email
-
no-chain-reply-to'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C Hama
n
o
Mer
g
e br
a
nch '
j
c/
m
aint-am
-
keep'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
Hamano
Merge br
a
n
ch
'
b
w/diff-col
o
r-hunk-header'
commit
|
commitdiff
|
tree
2009-11-28
Ju
n
io C Ham
a
no
U
p
dat
e
draft
rele
a
se 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
H
amano
e
mit_line(): don't e
m
it an empty <SET><RESET> followed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio C
Hamano
Remove dead code fr
o
m
"
gi
t
a
m
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio C
Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2009-11-27
Junio C
H
amano
bu
i
ltin-
a
pp
l
y
.
c: pay att
e
ntion to -p<n> whe
n
determinin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Junio
C
H
a
mano
Merge br
a
n
ch 'rs/work-a
r
ound-grep-op
t
-insan
i
ty
'
commit
|
commitdiff
|
tree
2009-11-24
Ju
n
io C Hamano
Merge branch 'rj/
m
aint-cygwin-
c
ount-objects'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
M
e
rge branch 'rs/color-escap
e
-
has-zero-
w
id
t
h'
commit
|
commitdiff
|
tree
2009-11-24
Juni
o
C Haman
o
Merge branch 'bg/apply-doc'
commit
|
commitdiff
|
tree
2009-11-24
Junio C
H
amano
Merge
branch 'mm/maint-hint-fa
i
led-merge'
commit
|
commitdiff
|
tree
2009-11-24
Junio C H
a
mano
Merge
b
ran
c
h 'jc/
l
og-stdin'
commit
|
commitdiff
|
tree
2009-11-24
Jun
i
o
C Hamano
Merge
branch 'mr/g
i
t
w
eb-snapshot'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hama
n
o
M
er
g
e
b
r
anch '
c
c/replace'
commit
|
commitdiff
|
tree
2009-11-24
Junio
C
Hamano
Merge branc
h
'
maint'
commit
|
commitdiff
|
tree
2009-11-24
Junio C
H
amano
Prote
c
t sc
r
ipted P
o
rcelains f
r
o
m
GREP_
O
PTIONS insa
n
i
t
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hama
n
o
Add
t
rivi
a
l tests for --stdin opti
o
n
t
o log family
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next