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
Merge branch 'mh/rebase-fixup'
2010-01-07
Junio C Haman
o
checkout -
m
:
d
o
not
t
ry to f
a
ll
b
a
ck to --merge f
r
om
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-06
J
uni
o
C Hamano
checkout -m
p
ath: fix recreating
c
o
n
flicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-06
Junio
C
Ha
m
ano
.
git
a
ttr
i
butes: d
e
tect 8-spac
e
indent in shell
s
c
ripts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Hamano
Fix bit as
s
ignment
for CE_CON
F
LICTED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Hamano
"re
s
et --me
r
ge": fix
unmerged case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-03
Jun
i
o C
H
amano
Merge branc
h
'
m
ain
t
'
commit
|
commitdiff
|
tree
2009-12-31
Junio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2009-12-31
J
unio C Hamano
M
erge branc
h
'
m
aint-1
.
6
.
0' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-30
J
unio C Hamano
M
erge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-30
Junio C Hamano
Merge branch 'maint-
1
.
6
.
1' int
o
m
ain
t
commit
|
commitdiff
|
tree
2009-12-30
Junio C Hamano
Me
r
ge branch 'maint
-
1
.
6
.
0' i
n
to mai
n
t
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-29
Jun
i
o
C
Hamano
R
emove
ht
t
p
.
authAny
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-28
Junio C Hamano
Merge
b
ran
c
h 'jk/1
.
7
.
0-s
t
atus'
commit
|
commitdiff
|
tree
2009-12-28
Junio C Ham
a
no
Me
r
ge branch
'
mai
n
t'
commit
|
commitdiff
|
tree
2009-12-27
Jun
i
o C Ha
m
ano
Merge branch 'nf/maint-fix-index-e
x
t-len-on-be64
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-26
J
u
ni
o
C Hamano
Mer
g
e b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
Makefil
e
: FreeBSD (bot
h
7 and 8) needs OLD_ICONV
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
Start 1
.
6
.
6
.
X maint
e
n
a
n
ce track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o
C
Hamano
Me
r
ge
b
ranch 'jc/maint-obsd46' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
K
i
ck off 1
.
7
.
0
cycl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C Ha
m
a
n
o
Merge
b
ran
c
h 'gb/1
.
7
.
0-dif
f
-whitespace-o
n
ly-o
u
tput'
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ha
m
a
no
M
e
rge bra
n
ch
'
jc/1
.
7
.
0-diff-whitespace-only
-
status'
commit
|
commitdiff
|
tree
2009-12-26
J
unio C Hamano
Merge
b
ranc
h
'jc/1
.
7
.
0
-push
-
safety'
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C Hamano
Merge bran
c
h
'jc/1
.
7
.
0
-send-email-no-thread
-
default'
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C Ham
a
no
Merge branch '
s
r/vcs-helper'
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ham
a
no
t4019
"grep
"
portability fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hama
n
o
t120
0
: work around a
b
ug i
n
some implementations of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
J
unio C Hamano
G
it 1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Ham
a
no
Merge br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2009-12-20
Junio
C Hamano
Gi
t
1
.
6
.
6-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio C
H
a
m
ano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2009-12-16
Ju
n
io C Hama
n
o
G
i
t 1
.
6
.
6
-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C H
a
m
an
o
Me
r
ge bra
n
ch 'm
a
int'
t
o sync
w
ith
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 Ha
m
ano
worktree: do
n
't segfault with an absolute pathspe
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Ju
n
io C Ha
m
ano
status/
c
ommit
:
do
n
ot sug
g
est "reset
H
E
AD <path>" w
h
i
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Jun
i
o C
H
amano
comm
i
t/stat
u
s
: "git
a
d
d
<path>" is n
o
t nec
e
ssari
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Junio C Hamano
c
o
m
m
it/stat
u
s: check
$
GI
T
_DIR/ME
R
G
E
_H
E
AD only o
n
ce
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
U
p
date
Release N
o
t
es for 1
.
6
.
6 to remove old bugfixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio
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
Jun
i
o C Hamano
G
i
t 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Juni
o
C H
a
m
ano
Fix archive forma
t
with -- on the
command line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C Haman
o
Remove post-upload-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Gi
t
1
.
6
.
6-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hama
n
o
Merge
git://repo
.
o
r
.
cz/git-gu
i
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Hamano
Merge git://git
.
kern
e
l
.
org/
p
ub/scm/gitk/
g
i
tk
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io
C
H
amano
Update d
r
a
ft release n
o
tes to 1
.
6
.
6 before -rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-09
Junio C
H
a
mano
Me
r
ge bra
n
ch
'mm/m
a
int-
m
erge-ff-error-messag
e
-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C Hamano
M
erge br
a
nch
'
j
n/m
a
int-pull-rebase-error-message'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
ma
n
o
Merge branch '
j
k/maint-a
d
d-p-delete-fi
x
' into maint
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
M
erge git
:
//g
i
t
.
bogomips
.
org/git-s
v
n
commit
|
commitdiff
|
tree
2009-12-08
Junio C Hamano
Re
v
ert
r
ec
e
nt "git merge
<
msg> HEAD <commit>
.
.
.
"
d
e
p
recation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-07
J
u
n
io C
Haman
o
Merge branch 'ma
s
ter'
into i
l
/vcs-helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Ju
n
io C Ham
a
no
Sync with
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C H
a
mano
Git 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Junio C
H
amano
T
e
a
c
h
--[no-]rerere-aut
o
update o
p
tion t
o
merge, revert
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Ha
m
a
n
o
Merge bra
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
m
a
n
o
Pre
p
are
f
or 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C Hamano
Merge br
a
nch 'uk/maint-shortlog-enco
d
ing'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
ama
n
o
Mer
g
e
branch 'fc
/
main
t
-forma
t
-patch-pat
h
s
pec-da
s
hes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Ham
a
no
M
e
rge b
r
anch
'
ap/m
a
i
n
t
-merge-s
t
rat
e
gy-list
-
fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Merge branch 'jc/maint-am-
k
eep' into
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
aman
o
Merge
branch 'rs/work-arou
n
d-grep-opt-
i
n
s
a
nity'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Ha
m
ano
Merge
b
ranch
'rj/main
t
-cygwin-count-objects' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge b
r
a
nc
h
'mm/maint-hi
n
t-fa
i
led-m
e
rge
'
i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
ma
n
o
Me
r
ge bran
c
h
'th
/
maint-re
m
o
t
e
-upd
a
te-
h
e
l
p-string' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merge
br
a
nch
'rj/main
t
-t9700' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C H
a
mano
M
e
rge branch 'ls/ma
i
nt-mai
l
in
f
o-no-inbo
d
y' into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Mer
g
e branc
h
'mo/maint
-
crlf-d
o
c' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Ham
a
no
M
e
rge
bra
n
ch 'th/
r
emote-usage' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Ha
m
an
o
Merge branch 'pb
/
maint
-
use-
c
ustom
-
perl'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C
H
am
a
no
Merge branch 'mm/config-pathname-tilde-expand'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge branch 'bc/grep-i-F' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
an
o
Merg
e
bra
n
ch 'jk/maint-b
r
eak
-
r
e
name-reduce
-
memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
M
e
r
g
e
branch 'rj/mai
n
t-simplify-cy
g
win-make
f
ile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merge branch 'rg/doc-workflow' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Merge
br
a
nch '
n
p
/m
a
int-sideband-favor
-
status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Do
c
umentation: x
m
lto 0
.
0
.
18 doe
s
n
o
t k
n
ow --stringp
a
ra
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
i
o C Ham
a
n
o
Merge 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
J
uni
o
C Hamano
Un
c
on
d
itionally s
e
t ma
n
.
base
.
url
.
for
.
relative
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
H
amano
Merge br
a
nch '
m
a
int'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Documenta
t
ion/M
a
kefi
l
e: allow
man
.
base
.
url
.
for
.
re
l
ative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Jun
i
o C
Hamano
G
i
t
1
.
6
.
6-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ha
m
ano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio
C Ham
a
no
Pre
p
a
re fo
r
1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
H
ama
n
o
merg
e
: do not
a
dd st
a
n
da
r
d me
s
sa
g
e when me
s
s
a
g
e
is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
J
u
n
io C Ham
a
no
Do
n
ot misidentify "git
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 Ha
m
a
no
Update
d
raf
t
release
n
o
tes to 1
.
6
.
6
b
efore -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io C Hamano
Merg
e
branch 'main
t
'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Mer
g
e
b
r
a
nch 'jc/dep
r
ecate
-
old-syntax-fr
o
m-merge'
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o C Hamano
gi
t
-merge: a d
e
precation notice of the
a
n
cie
n
t
command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio
C Haman
o
Merge bran
c
h 'bw/rem
o
te-get-r
e
f-s
t
ates-fix'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ha
m
ano
Merge branch 'jn/gitweb-blam
e
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
amano
Merge branch 'fc
/
m
a
i
nt-format-patch-
p
athspec
-
dashe
s
'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C Hamano
Merg
e
branch '
m
m/maint-merge-ff-err
o
r-messa
g
e-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge br
a
nch
'ap/maint-merge-strateg
y
-
l
i
s
t-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
H
a
mano
Merg
e
branch
'jc
/
pre
t
ty-lf'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C Ham
a
no
Me
r
ge
branch 'cc/bise
c
t
-
d
o
c
'
commit
|
commitdiff
|
tree
next