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
Git 1.7.0.4
2010-01-12
Junio
C
Hamano
grep:
-L should show
empty fil
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
Ha
m
ano
p
r
et
t
y
.
c
:
mark file-l
o
cal fun
c
t
ion static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C
H
amano
bu
i
l
tin-
r
ev-list
.
c: ma
r
k file-
l
ocal function stati
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C H
a
mano
bisect
.
c: mark
f
il
e
-loca
l
f
unct
i
on static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Juni
o
C
Hamano
r
erere forget p
a
th: forget
r
ecorded res
o
lution
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Jun
i
o C Hamano
rerere:
refact
o
r
rerere logic
t
o make i
t
inde
p
endent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Jun
i
o C Hamano
ident
.
c: treat $
E
MAIL as gi
v
ing user
.
email identity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Junio C
Hama
n
o
ident
.
c: ch
e
ck expl
i
c
it i
d
ent
i
ty for name and email
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Me
r
g
e branch '
t
r/http
-
u
pdates'
commit
|
commitdiff
|
tree
2010-01-10
Jun
i
o C Hama
n
o
Merge bran
c
h
'jk
/
maint-1
.
6
.
5-reset-hard'
commit
|
commitdiff
|
tree
2010-01-10
Junio C H
a
mano
M
e
rge branch 'jk/pu
s
h-to-d
e
let
e
'
commit
|
commitdiff
|
tree
2010-01-10
Ju
n
io C Hamano
Merge br
a
nch 'mm/
c
onfig-path'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Mer
g
e
branch 'pm/cvs
-
environ'
commit
|
commitdiff
|
tree
2010-01-10
J
unio
C
Hama
n
o
M
e
rge branch
'
tr/mai
n
t-1
.
6
.
5-bash-prompt
-
show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge
b
ran
c
h '
b
g/maint-remote-u
p
date-d
e
fault'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge bra
n
ch 'mm/diag
-
path-i
n
-t
r
eeish'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Ha
m
ano
M
e
r
g
e branch 'fc/opt-quiet-gc-reset'
commit
|
commitdiff
|
tree
2010-01-10
J
unio C Hamano
Merge b
r
a
nch
'
maint'
commit
|
commitdiff
|
tree
2010-01-10
Junio
C
Hamano
Merge
b
ranc
h
'm
a
int-1
.
6
.
2' in
t
o
m
aint
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Me
r
ge bra
n
c
h
'maint-1
.
6
.
1'
into maint
-
1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'maint-1
.
6
.
0' into mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-09
Ju
n
io C Haman
o
ls-fil
e
s: fix overeager pathspec optim
i
zation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-09
Ju
n
i
o
C Ham
a
no
r
e
ad_d
i
re
c
tory(): further split tr
e
at_pat
h
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-09
Junio C Hamano
r
e
ad_d
i
rectory_recursiv
e
():
refactor handling of
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-09
Junio
C Haman
o
t3001: test ls-files -o ignored/dir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-08
Jun
i
o C Hamano
ident
.
c: re
m
ove unused variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
J
unio
C
Hamano
D
e
scribe se
c
o
n
d bat
c
h
f
o
r 1
.
7
.
0 i
n
draft release
not
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
Juni
o
C Ham
a
no
M
e
rge branc
h
'js
/
filter-branch
-
prime'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
Merge branch
'
s
b
/maint-octopus'
commit
|
commitdiff
|
tree
2010-01-07
J
unio C H
a
mano
M
erge branch 'mg/t
a
g
-
d-show'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hama
n
o
Merge
b
ranch 'so
/
cvsserv
e
r-update'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
Merge
b
r
anch
'bg/m
a
int-add-al
l
-doc'
commit
|
commitdiff
|
tree
2010-01-07
J
u
nio
C
Haman
o
Merge branch 'mv/
c
o
mmit
-
d
a
te'
commit
|
commitdiff
|
tree
2010-01-07
J
unio C
H
a
mano
M
e
rge branc
h
'mo/bin-wrap
p
ers'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Ham
a
n
o
read-tr
e
e --debu
g
-u
n
pack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
unpack-tre
e
s
.
c
:
look ahead in t
h
e index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
Jun
i
o C H
a
mano
unpack-
t
rees
.
c
:
prepar
e
for looking ah
e
ad in t
h
e
index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
Jun
i
o C
Hamano
checkout -m:
d
o not try to fa
l
l back to --merge
f
rom
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-06
Junio C Ham
a
no
c
heckout
-
m pat
h
: fix recre
a
t
ing conflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-06
Jun
i
o C Hamano
.
g
itattributes: d
e
tect 8-space
ind
e
nt in shell
scri
p
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Hamano
Fix
b
it a
s
signment for CE_C
O
N
FLICTED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Ju
n
io C Hama
n
o
Aggressive
t
hree-way merge: fix D/F
case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Jun
i
o C Hamano
traverse_tr
e
es():
h
andle
D/F con
f
l
i
ct case
sanely
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Juni
o
C Ham
a
no
more
D/F conflic
t
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio
C Hamano
tests
:
move
c
onvenience r
e
gexp
t
o match object name
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Hamano
"reset --merge": fix u
n
m
e
rged case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-03
Junio C
Hamano
M
e
rge
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-12-31
Junio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-31
Junio C Hamano
M
e
rge branch 'mai
n
t-1
.
6
.
0' into maint
commit
|
commitdiff
|
tree
2009-12-30
Ju
n
io C Hamano
Merg
e
branch 'main
t
'
commit
|
commitdiff
|
tree
2009-12-30
Junio C
Hamano
branch -d: ba
s
e
the
"already-merged" safety on t
h
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Junio C Hamano
Merge branch 'maint-
1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-12-30
Junio C Hamano
Me
r
g
e branch '
m
aint-1
.
6
.
0' into m
a
i
nt-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-29
Juni
o
C
H
a
mano
Remove http
.
aut
h
Any
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-28
Jun
i
o C H
a
mano
Merge branch 'jk/1
.
7
.
0-
s
tatus'
commit
|
commitdiff
|
tree
2009-12-28
Junio C H
a
mano
Merge br
a
nch 'm
a
int'
commit
|
commitdiff
|
tree
2009-12-27
Jun
i
o C
H
amano
Merge
branch 'nf/mai
n
t-fix-index-ext-
l
e
n-on-
b
e64
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hama
n
o
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ha
m
an
o
Mak
e
file: F
r
e
e
B
SD (bo
t
h
7
and
8
) needs
OLD_ICONV
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
J
u
n
io C Ham
a
no
St
a
r
t
1
.
6
.
6
.
X mainten
a
nce track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
Merge branch '
j
c/maint-obsd46' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C Ha
m
ano
Kick off 1
.
7
.
0 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ham
a
no
Mer
g
e
branch
'
gb/1
.
7
.
0-diff-w
h
itespace
-
on
l
y
-outp
u
t
'
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ha
m
an
o
Merge bra
n
ch 'jc/1
.
7
.
0-diff-wh
i
te
s
pace-onl
y
-status'
commit
|
commitdiff
|
tree
2009-12-26
Junio C
H
a
mano
Merge branch 'jc
/
1
.
7
.
0-push-safet
y
'
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
Merge br
a
nch 'jc/1
.
7
.
0
-send-ema
i
l-
n
o-thread-defau
l
t'
commit
|
commitdiff
|
tree
2009-12-26
Ju
n
i
o
C Hamano
Merge branch 'sr/vcs-hel
p
er'
commit
|
commitdiff
|
tree
2009-12-26
J
u
nio C H
a
man
o
t4
0
19 "grep" po
r
tability fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
t
1
200: work
a
roun
d
a bug in some im
p
l
ement
a
t
ions of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Haman
o
rerere: remove silly 1024-byte
l
ine limit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Ju
n
io
C
Hamano
r
e
sol
v
e-undo: teach "
u
pd
a
te-in
d
ex --
u
nresolve" to use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
Haman
o
res
o
l
ve-undo:
"
checkout -m path
"
uses resolve-undo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Ju
n
io C Hamano
r
esolve-undo: allow
p
lu
m
b
ing to clear the
information
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
J
unio C Hamano
re
s
olve-undo: basic te
s
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C Ha
m
a
no
r
es
o
lve-und
o
: re
c
or
d
res
o
lve
d
co
n
flic
t
s in a new
i
ndex
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C Hama
n
o
buil
t
in-mer
g
e
.
c: use
s
tandard active_cac
h
e m
a
c
r
os
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Junio C Ha
m
ano
Git 1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Ju
n
i
o
C
H
amano
M
e
rge
branch 'maint'
commit
|
commitdiff
|
tree
2009-12-20
J
u
nio 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
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-16
Junio C Ham
a
no
Git 1
.
6
.
6-
r
c3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
J
u
n
i
o
C Hamano
M
e
r
g
e
branch 'm
a
int' to sync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Gi
t
1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Haman
o
worktree: do
n
't segfault with
an absolu
t
e path
s
pec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Junio C Hamano
status/co
m
mit: do not suggest "reset HE
A
D <
p
at
h
>
"
while
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
J
unio C Ham
a
no
commit/status:
"
git
a
dd <path>" is not
necessarily
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
J
u
nio C Hamano
commit/s
t
atus: check $GI
T
_DIR/ME
R
GE_
H
EAD only on
c
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
Update Release Notes for 1
.
6
.
6 to remove old bu
g
fixes
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
Jun
i
o C
H
aman
o
Git
1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Juni
o
C Ha
m
a
n
o
Fix arch
i
v
e
forma
t
with -- on t
h
e
command line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C Hamano
R
e
move post-upload
-
hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Git 1
.
6
.
6-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge
git://repo
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge git://git
.
kernel
.
org/pub/scm/
g
i
tk
/
gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ha
m
ano
Update draft release
n
o
t
es to 1
.
6
.
6 before -rc
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Hamano
Merge
b
ranch 'mm/maint-merge-ff-error-message-
f
ix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio
C H
a
m
a
n
o
Merge branch
'jn/
m
aint-pull-rebase-error-message' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge branch 'jk/maint-add-p-delete-
f
ix' into maint
commit
|
commitdiff
|
tree
next