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: prepare for customizable conflict marker length
2010-01-17
J
u
nio C H
a
mano
rerer
e
: p
r
epare for customizable confl
i
ct m
a
rke
r
length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
c
onflict-marker-size: new attrib
u
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Ham
a
no
rerere: use ll_mer
g
e
(
)
i
n
stead
o
f
using
x
d
l
_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Haman
o
merge-tree: use ll_merge() not xd
l
_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
xdl_merge(): allow passing down m
a
r
k
e
r
_s
i
ze i
n
xmparam_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
n
o
x
d
l_
m
erge(): int
r
oduce
x
mparam_t for merge spec
i
fic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
g
it
_
attr
(
): fix f
u
nctio
n
signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio C
H
a
mano
re
r
er
e
forget
p
ath: forge
t
rec
o
rded reso
l
ut
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
J
u
nio
C Hamano
rer
e
r
e
: refa
c
tor
rerere
l
o
g
ic to mak
e
i
t
inde
p
enden
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
re
r
er
e
: remove
s
illy 102
4
-byte line
l
imit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C Hamano
resolve-undo:
t
each "upda
t
e-index
-
-
u
nresolve"
t
o use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C Hamano
resolve
-
u
n
do:
"
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
a
no
resol
v
e-undo: allow
plumbi
n
g to
clear the informatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
r
e
solv
e
-
u
ndo
:
basi
c
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Ju
n
io C Hamano
r
esolve-undo
:
record r
e
solved c
o
nflicts in a new index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C
Hamano
builtin-merge
.
c: use st
a
ndard active_cache macros
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
M
erge br
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-20
Junio C H
a
m
a
no
Git 1
.
6
.
6-r
c
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Git 1
.
6
.
6-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Merge bra
n
ch 'ma
i
nt' to sync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio C Haman
o
Git 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Juni
o
C Hamano
work
t
ree:
don't segfault wit
h
a
n
absolute pathspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Jun
i
o C Hamano
Update
R
elease Notes for 1
.
6
.
6 to remove old b
u
g
f
ixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Ju
n
io C Hamano
Sync w
i
th 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
Ju
n
i
o
C Hamano
Fix archi
v
e f
o
rmat with --
o
n the
command line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
io C H
a
mano
R
emove post-uplo
a
d
-
h
o
ok
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C
Hamano
Git
1
.
6
.
6-rc
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge git://repo
.
or
.
cz/gi
t
-gui
commit
|
commitdiff
|
tree
2009-12-09
J
unio C
Hamano
Merge gi
t
://git
.
kernel
.
o
rg/pub/scm/gitk/g
i
tk
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Ha
m
a
no
Update draft relea
s
e 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
Mer
g
e bran
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ham
a
no
Merge branch 'mm/maint-merge-ff-error-
m
essage-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Haman
o
Merge
branch 'j
n
/maint-pull-rebase-error-message' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C
H
aman
o
M
e
r
ge branch 'j
k
/
maint-add-p-d
e
lete
-
fi
x
' into maint
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Hamano
Merge git://git
.
bogo
m
ips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C Hamano
R
e
vert
recent
"
git merge
<
msg> H
E
AD <c
o
mmit>
.
.
.
"
d
eprec
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Sync wi
t
h
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio
C
H
a
m
ano
Git 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
uni
o
C
H
aman
o
Me
r
ge b
r
anch '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
H
a
m
a
no
Merge branch 'uk/main
t
-
s
hortl
o
g-encoding' in
t
o main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
erge
b
ranch 'fc/
m
ai
n
t-format-patch-pa
t
hspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge bra
n
ch 'ap/maint-merg
e
-strategy-li
s
t-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bran
c
h 'jc/m
a
int-
a
m-keep' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merge
b
ranch
'rs/wo
r
k
-a
r
ound-grep-op
t
-insanit
y
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Me
r
ge branch 'rj/mai
n
t-cygwin-coun
t
-obj
e
cts'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Ha
m
ano
Merge br
a
n
ch
'mm/maint-hint-failed-merge' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C H
a
m
ano
Merge branch
'th
/
maint-remo
t
e-update-help-
s
trin
g
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
branch '
r
j/
m
aint-t9700' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C
Ha
m
ano
Merge b
r
an
c
h 'ls/main
t
-mailinfo-no-inbo
d
y' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
M
e
rg
e
branch 'mo/maint
-
crlf-doc' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
amano
Merge branch
'th/remote-usage'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merge branch 'pb/m
a
i
n
t-use-custom-perl' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C
Haman
o
M
e
rge branch
'
m
m/conf
i
g-pathname-
t
i
l
de-e
x
pand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge br
a
n
ch 'bc/g
r
ep-i-F' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Merg
e
branch 'j
k
/main
t
-
break-rename
-
reduce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bran
c
h 'rj/maint-simplify-cygwin-make
f
ile'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Ham
a
no
Merge branch 'rg
/
doc-workflow'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
M
erge bran
c
h 'np/
m
a
int-sid
e
band-fav
o
r-s
t
atu
s
' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C Hamano
Do
c
um
e
nta
t
io
n
: x
m
lto 0
.
0
.
18 does
not kn
o
w --st
r
ingparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merg
e
in
1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Git 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
m
ano
Unconditi
o
n
ally set
man
.
base
.
url
.
for
.
relative
.
link
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
i
o C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Document
a
t
i
o
n/Makefile:
a
l
low man
.
base
.
url
.
for
.
r
elative
.
.
.
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 H
a
m
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ha
m
ano
P
r
epare
f
or 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ha
m
a
n
o
merge: do
n
o
t add standard message when mes
s
ag
e
is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
J
u
nio C Ha
m
ano
D
o n
o
t
m
isi
d
entify "git
m
erge
f
oo HEAD" as a
n
old
-
s
t
yle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hama
n
o
U
pdate draft release
n
otes
t
o 1
.
6
.
6 be
f
ore -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
H
amano
M
erge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io C Haman
o
Merge
b
ranch 'jc/dep
r
eca
t
e-ol
d
-syntax-from-merge'
commit
|
commitdiff
|
tree
2009-12-01
J
unio
C
Hamano
git-merge: a depr
e
c
a
t
i
on notice of the ancie
n
t comman
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Juni
o
C Hamano
M
e
rge branch
'bw/remote
-
get-ref-
s
tates-fix'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
M
e
rge br
a
n
ch '
j
n/gitweb-
b
lame
'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio
C H
a
mano
Merge branch 'fc/maint-format-patch-path
s
p
e
c-
d
a
shes'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io
C
Hamano
Merge bran
c
h '
m
m
/main
t
-merg
e
-ff-err
o
r-message-fix'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C Hamano
Merg
e
branch 'ap/maint
-
m
er
g
e-
s
t
r
at
e
gy-
l
ist
-
fix'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C Ham
a
n
o
M
e
rg
e
branch '
j
c/pretty
-
lf'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C
Ha
m
ano
Merge br
a
nch 'cc/bisect-doc'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge
branch 'em/
c
ommi
t
-claim'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
amano
Merge branch 'jc/ma
i
linfo-remove-brac
k
ets'
commit
|
commitdiff
|
tree
2009-11-30
J
unio C Hamano
M
erge branch 'fc/send-em
a
il-envelope'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C Hamano
Merge branch
'
u
k
/maint-shor
t
log-e
n
coding'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge bra
n
c
h 'ns/sen
d
-email-no
-
c
h
ain-reply-
t
o'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C Hamano
Mer
g
e bra
n
ch 'jc/ma
i
nt-am-
k
e
ep'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
Hamano
Merge br
a
nch 'bw/di
f
f-
c
olor-hunk-header
'
commit
|
commitdiff
|
tree
2009-11-28
Junio C Hamano
Update draft r
e
lease no
t
e
s
to
1
.
6
.
6
b
efore m
e
rg
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Jun
i
o C Ham
a
no
e
m
it_line(): don't
emit an e
m
pty <SET><RE
S
ET> fol
l
owed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
Remove dead code from "g
i
t
am"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Haman
o
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-11-27
Junio C H
a
mano
builti
n
-apply
.
c: pay a
t
tent
i
on t
o
-p<n> when determ
i
ni
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Junio
C Hamano
Merge bran
c
h 'rs
/
wor
k
-around-gr
e
p-
o
pt-insanity'
commit
|
commitdiff
|
tree
2009-11-24
J
unio
C Hamano
Merge
b
r
anch '
r
j
/mai
n
t
-
cygwin-count-o
b
j
e
cts'
commit
|
commitdiff
|
tree
2009-11-24
J
u
nio C H
a
m
ano
M
erge branch 'rs/colo
r
-esca
p
e-ha
s
-z
e
ro-width'
commit
|
commitdiff
|
tree
2009-11-24
Junio C
H
amano
Merge bran
c
h 'bg/ap
p
l
y
-d
o
c'
commit
|
commitdiff
|
tree
next