repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rerere: honor conflict-marker-size attribute
2010-01-17
Junio
C
Hamano
rere
r
e: honor conf
l
ict
-
mar
k
er-size attrib
u
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
r
erere: prepare
f
or
custom
i
zab
l
e conflict
m
arker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
conflict-marker-size: n
e
w attrib
u
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
rerere
:
use ll_merge() instead
o
f usi
n
g xd
l
_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
merge-tree:
use ll_merge() not
x
d
l_merge(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C
H
a
mano
x
d
l_mer
g
e(
)
: a
l
low passing
down marker_size in xmp
a
ram_
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
n
o
xdl_m
e
rge(): in
t
roduce
x
mparam_t for m
e
rg
e
speci
f
ic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
git_attr(): fix function
sig
n
ature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio
C Hamano
rerere forget
path: forget recorded resolution
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Haman
o
r
erere: r
e
factor rerer
e
logic
t
o
m
ake it independent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C H
a
mano
rerere: r
e
mov
e
silly 1
0
24-byte line
l
i
m
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C Hamano
resol
v
e-undo
:
te
a
ch "update-index -
-
unresolve"
t
o use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ham
a
no
resol
v
e-undo: "checkout -m path" uses resolv
e
-undo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Ju
n
io C Hamano
resolv
e
-
undo: allow plumbing to clea
r
the inform
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C Hamano
res
o
lve-
u
n
do: basic tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
Hama
n
o
r
esolve-undo:
record resolv
e
d conflicts
in a new in
d
ex
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o
C Ham
a
n
o
builtin-merge
.
c: use standa
r
d active_cache
macros
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Jun
i
o C Hama
n
o
Git 1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Haman
o
Merge br
a
n
ch '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
Jun
i
o C Haman
o
Merge b
r
anch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2009-12-16
Junio
C
Hamano
Gi
t
1
.
6
.
6-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio
C Ham
a
no
M
e
r
g
e branch 'maint' to sync w
i
t
h 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
Junio C Hamano
worktree: don't se
g
fault with
an
a
b
solute p
a
thspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C
Hamano
Up
d
ate Release Notes
f
or 1
.
6
.
6 to re
m
ove old bugfix
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio
C
H
a
mano
Sync
w
ith 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
unio C Hamano
Git
1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Haman
o
F
ix
archive format w
i
th -- on t
h
e
command 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
J
u
n
io C Hamano
Git 1
.
6
.
6-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Haman
o
Merge git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge git://git
.
kernel
.
org/pub/scm
/
gitk
/
gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Updat
e
draft rel
e
ase notes to 1
.
6
.
6
b
e
f
ore -rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
J
unio
C Hamano
M
er
g
e bra
n
c
h
'
m
a
int'
commit
|
commitdiff
|
tree
2009-12-09
J
uni
o
C
H
a
mano
Merge
branch
'
mm/maint-mer
g
e-ff-error-message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge bra
n
ch
'
jn/ma
i
nt-pull-re
b
ase
-
error-message' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C
H
amano
M
erge bra
n
ch 'jk/maint
-
a
d
d-p-delete-fix' in
t
o
maint
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Hamano
M
erge git:
/
/git
.
bogomips
.
o
r
g/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio
C Hamano
Revert rec
e
nt "git
m
e
r
ge
<
msg>
HEAD
<commit>
.
.
.
" deprecation
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
Junio C Haman
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
Merge 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
J
u
ni
o
C Hamano
Me
r
g
e
bran
c
h 'uk/maint-shortlog-enco
d
i
ng' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C H
a
ma
n
o
Merge bran
c
h
'fc/maint-format-pat
c
h-pathspec
-
dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merge branch 'ap/maint-merge-strate
g
y-list-
f
ix'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
n
o
Merge br
a
nch 'jc/m
a
int-am-keep'
i
nto main
t
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hama
n
o
Merge bran
c
h '
r
s/w
o
rk-around-gr
e
p-opt-
i
nsani
t
y' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io
C Hamano
Merg
e
branch 'rj/m
a
in
t
-cygwin-coun
t
-objects'
i
nt
o
mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merge branch 'mm
/
maint-hi
n
t-fail
e
d
-merge' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C H
a
m
a
no
Merg
e
bra
n
ch
'
th/maint
-
re
m
o
t
e-update-help-string' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'rj/maint-t9700' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
ma
n
o
Merge bran
c
h 'ls/m
a
int-mailinf
o
-no-inbody' into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C
H
amano
Merge bra
n
ch 'mo/maint-crlf
-
doc' int
o
m
a
int
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Haman
o
Merge
b
ranch 'th/remote-usage' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merg
e
br
a
nch 'pb/maint-use-custom-perl' into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge
b
ranch
'mm/config-pathname
-
tilde
-
expand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'
bc/grep-i-
F
' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge bran
c
h
'jk/mai
n
t-break-renam
e
-reduce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge branch 'rj/maint-simplify-
c
ygwin-m
a
kef
i
l
e
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branc
h
'rg/doc-work
f
low' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
M
erg
e
b
r
anch 'np/
m
ai
n
t-sideband-favor-st
a
tus' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C H
a
ma
n
o
Docum
e
ntation: xmlto 0
.
0
.
18
d
oes not kn
o
w --stringpara
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
a
m
ano
M
e
rge in 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
G
i
t 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Unconditio
n
a
l
ly s
e
t man
.
bas
e
.
url
.
for
.
relativ
e
.
link
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C Haman
o
D
ocum
e
nt
a
tion/
M
a
k
efi
l
e:
allow ma
n
.
ba
s
e
.
url
.
for
.
r
e
lative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
H
am
a
no
Git
1
.
6
.
6-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
J
unio C Hamano
M
e
rge
branch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io C Hamano
Prepa
r
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
H
amano
me
r
ge: do not a
d
d standard
m
essa
g
e when mes
s
age is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
H
amano
Do
not m
i
s
i
dentify "
g
it
merge foo HEAD" as an o
l
d-
s
tyle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ha
m
ano
Update draft
rele
a
se
n
otes t
o
1
.
6
.
6
before -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
J
unio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Mer
g
e
branch
'
jc/deprecate-old-sy
n
tax-from-merge
'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hama
n
o
git-me
r
ge: a deprec
a
ti
o
n noti
c
e
of
t
he anc
i
ent command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ha
m
ano
Merge branch 'bw/r
e
mo
t
e-
g
et-ref-states-fix'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Haman
o
Merge branch 'jn/gitweb-blame'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
Hamano
Me
r
ge branch '
f
c
/
ma
i
n
t
-for
m
at-patch-p
a
thspec-dashes'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ha
m
an
o
Merge branc
h
'mm/maint-
m
erge-ff-error-message-
f
ix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge
bran
c
h 'a
p
/
m
aint-merge
-
strategy
-
list-fix'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C
H
a
mano
Merge branch
'
jc/pretty-lf'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ha
m
a
n
o
Merge branch 'cc/bi
s
ect-doc'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
amano
Merge branch 'em/co
m
m
it-claim'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o
C Hamano
Merge branch 'j
c
/m
a
ili
n
fo-r
e
mov
e
-brackets'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
Hamano
Merge branch
'fc/send-email-e
n
velope'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C Hamano
Me
r
g
e branc
h
'uk/ma
i
nt-
s
ho
r
t
log-e
n
coding'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C Hamano
Merge br
a
nch '
n
s/sen
d
-email-no-chain-rep
l
y-
t
o
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hama
n
o
Merg
e
branch '
j
c/main
t
-am-keep'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o
C H
a
mano
Merge branch 'bw/dif
f
-col
o
r
-hunk-he
a
der'
commit
|
commitdiff
|
tree
2009-11-28
J
unio C Haman
o
U
pdat
e
draft re
l
ease
no
t
es t
o
1
.
6
.
6
before m
e
r
g
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Junio C H
a
mano
emit
_
l
i
n
e(): don't emit an empty <SET><RESET> f
o
llo
w
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
J
u
nio
C Hamano
R
e
m
o
ve dead co
d
e from "
g
i
t
am"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Ha
m
ano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2009-11-27
Jun
i
o
C Ham
a
no
builtin-apply
.
c: pay at
t
ention to -p<n> when deter
m
i
ning
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Junio
C
Hamano
Mer
g
e branch 'rs/work-around-grep-opt
-
insanity'
commit
|
commitdiff
|
tree
2009-11-24
Ju
n
io
C
Hamano
Merge
b
ra
n
ch 'rj/maint-cygwin
-
c
ou
n
t
-
objects'
commit
|
commitdiff
|
tree
2009-11-24
Junio
C
Ha
m
ano
Merge branch 'rs/color-escape
-
has-ze
r
o
-wi
d
t
h
'
commit
|
commitdiff
|
tree
next