repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Support a merge with conflicting gitlink change
2007-12-11
Junio C Hamano
Sup
p
o
r
t
a merge with co
n
f
l
ict
i
ng gitlin
k
change
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-10
Junio
C H
a
mano
Upda
t
e draft Release Notes for 1
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-09
Junio C Hamano
Re-fix ls-re
m
o
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-09
Junio C Hamano
Me
r
g
e branch
'
jc/spht
'
commit
|
commitdiff
|
tree
2007-12-09
Junio C Ha
m
ano
Merge b
r
anch 'pr/m
e
rge
t
o
o
l'
commit
|
commitdiff
|
tree
2007-12-09
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-12-09
Junio C Hamano
Re-fi
x
"built
i
n-
c
om
m
it: fix
-
-
s
i
g
noff"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-09
Junio C Ham
a
n
o
Fix commit-msg hook to allow editing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-09
Junio
C Ha
m
ano
l
s
-
rem
o
t
e
:
r
es
u
r
re
c
t pattern limit suppor
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-08
Junio C
H
a
m
ano
shortlo
g
:
code restructuring and clean-up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-08
Jun
i
o C Haman
o
mailmap
:
fi
x
bogus for(
)
loop
t
hat happened to b
e
safe
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-08
Junio C Hamano
git-bisect vis
u
alize: work in
n
on-windowed envir
o
n
ment
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-07
Junio C H
a
mano
U
pd
a
te
d
r
af
t
release note
s
t
o 1
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-07
Junio
C
Hamano
Merge branch 'master' of gi
t
://rep
o
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-12-07
Junio C Hamano
M
erge
branch 'mw/cvsserver'
commit
|
commitdiff
|
tree
2007-12-07
Junio C H
a
man
o
M
erge branch '
k
h/
f
etch-optp
a
rse'
commit
|
commitdiff
|
tree
2007-12-07
Junio C Hamano
Merge branch 'jc/g
i
t-log-doc'
commit
|
commitdiff
|
tree
2007-12-07
Junio C Hamano
Merge branch 'jc/addi-color
'
commit
|
commitdiff
|
tree
2007-12-07
Junio
C Hamano
Merge branch '
j
c/docmake
-
p
e
rl'
commit
|
commitdiff
|
tree
2007-12-07
Junio C Hamano
M
er
g
e branch 'jc/c
l
ean-fix'
commit
|
commitdiff
|
tree
2007-12-07
J
u
nio C Hamano
Merge branch 'ma
i
nt
'
commit
|
commitdiff
|
tree
2007-12-06
J
un
i
o C Hama
n
o
git-status docume
n
tation: m
e
ntio
n
sub
d
irec
t
ory beh
a
vi
o
ur
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-06
Juni
o
C Haman
o
do not
d
iscard st
a
tus in fetch_refs_via
_
pack()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-06
J
u
nio C
Hamano
hg-to-
g
it:
handle an empty dir i
n
hg
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-06
Jun
i
o
C
Hamano
U
se gitattrib
u
tes
t
o defi
n
e per-path wh
i
t
e
space rule
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-06
Junio C Hamano
confi
g
--ge
t
-colo
r
bool:
diff
.
c
o
lor is a dep
r
ecated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-06
J
un
i
o C Hamano
git-cle
a
n: Hon
o
r
pathspec
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-06
Jun
i
o
C Hamano
C
o
lor suppor
t
for "git-ad
d
-i"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-06
Junio C Ham
a
no
git c
o
n
fig --ge
t
-
color
b
ool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-06
Junio C Hamano
Doc
u
mentation: color
.
* = true
means "a
u
to"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-06
Jun
i
o
C
H
a
mano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-12-06
Junio
C Hamano
g
it-
a
m
-
i: report rewritten title
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-06
Junio C
H
a
mano
gi
t
grep shows th
e
sa
m
e hit r
e
pe
a
tedl
y
for unme
r
ged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-05
Junio C Hamano
Merge branch 'nd
/
m
a
int-work-tree-fix' into mai
n
t
commit
|
commitdiff
|
tree
2007-12-05
J
u
nio
C Ha
m
ano
Revert
"
g
it-am: catch
mis
s
i
n
g author date early
.
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-05
Junio C Ha
m
ano
git-
c
v
s
server runs h
o
oks/post
-
upd
a
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-05
Junio
C
Hamano
t5510: add a
b
i
t more tests fo
r
fetch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-05
J
u
nio C Hamano
Merge bra
n
c
h
'wc/add-i'
commit
|
commitdiff
|
tree
2007-12-05
Juni
o
C Hamano
Merge branch 'kh/comm
i
t'
commit
|
commitdiff
|
tree
2007-12-05
Jun
i
o C Ha
m
ano
Merge b
r
anc
h
'sp
/
refspec-match'
commit
|
commitdiff
|
tree
2007-12-04
Junio C
H
ama
n
o
Docu
m
entation/git
.
txt:
t
ypofi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-04
Junio
C
Hama
n
o
Doc
u
mentation
:
rerere i
s
enabled by default these
days
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-04
Jun
i
o C Hamano
Formatting
fix for Documentation
/
gi
t
-help
.
t
xt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-04
Juni
o
C Ha
m
ano
Run t
h
e speci
f
ied
perl in Docume
n
tation/
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-04
Junio C Ha
m
ano
Update
dra
f
t
release not
e
s for 1
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-04
Junio C Haman
o
A
d
d
g
it-fast-export to list of c
o
mman
d
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-03
Junio C Hama
n
o
git-
c
o
m
mit
d
o
c
umentation: fi
x
unfinis
h
ed sentenc
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-03
J
u
n
i
o C
Hamano
git-commit --
a
llow
-
emp
t
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-03
Junio C
Hama
n
o
git
-
commit
-
-a
l
low-e
m
pty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-03
Junio
C
Hamano
git-commit: Allow to amen
d
a m
e
rge c
o
mmi
t
that does
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-03
Junio C Hamano
Fix --signoff
i
n builtin-commit
d
i
f
fere
n
t
ly
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-03
Junio
C
Hamano
Merge branch 'js/prune-expire'
commit
|
commitdiff
|
tree
2007-12-03
Junio C Hamano
Merge
b
r
a
nch 'js/export-with-assignment'
commit
|
commitdiff
|
tree
2007-12-03
Junio C H
a
m
ano
Merge b
r
anch 'js/fa
s
t-exp
o
rt
'
commit
|
commitdiff
|
tree
2007-12-03
Junio C Hamano
Merge bran
c
h 'j
s
/rebase-i-rerere'
commit
|
commitdiff
|
tree
2007-12-03
Jun
i
o
C
Hama
n
o
Merge br
a
nch 'j
s
/pu
l
l-rebase'
commit
|
commitdiff
|
tree
2007-12-03
Junio C Hamano
Me
r
ge bran
c
h 'wc/
r
eb
a
s
e-ins
n
'
commit
|
commitdiff
|
tree
2007-12-03
Jun
i
o C Ham
a
no
Merge b
r
anch 'jc/ty
p
ebr
e
ak'
commit
|
commitdiff
|
tree
2007-12-03
Junio C Hamano
Merg
e
b
r
anch 'jc/c
o
lor'
commit
|
commitdiff
|
tree
2007-12-03
Juni
o
C
H
amano
Merge branch '
d
c/
g
itweb'
commit
|
commitdiff
|
tree
2007-12-02
J
u
nio
C Haman
o
git-am: catch missing author date e
a
rly
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-02
Junio C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-12-02
Jun
i
o C Hamano
rename:
Break fil
e
pai
r
s with diff
e
rent
t
ypes
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-02
Junio C Hamano
Upd
a
te draft rele
a
se
n
otes
f
or 1
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-02
Junio C Hamano
Consolidate command list to
o
ne
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-02
J
u
nio C Hamano
Resurrect
peek-re
m
ote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-02
Junio C H
a
mano
Merge branch
'
tt/help'
commit
|
commitdiff
|
tree
2007-12-01
Junio
C
H
a
mano
Merge branch 'jc/move-gitk'
commit
|
commitdiff
|
tree
2007-12-01
Junio
C
Ha
m
ano
Merge bran
c
h 'jc/branch-contains'
commit
|
commitdiff
|
tree
2007-12-01
Junio C
Hamano
Merge branch 'cr/tag-options'
commit
|
commitdiff
|
tree
2007-12-01
Junio
C
H
a
ma
n
o
Upd
a
te draft rele
a
se no
t
es for 1
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-01
Junio C Haman
o
Merge 1
.
5
.
3
.
7 in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-01
J
unio C Hamano
GIT 1
.
5
.
3
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-01
J
unio
C
H
a
mano
Fix
t
ypo in t4
0
0
8
test title
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-01
Junio C Haman
o
Merg
e
branc
h
'maint'
commit
|
commitdiff
|
tree
2007-11-30
Junio C H
a
mano
Merge br
a
nch 'jk/maint-cv
s
i
m
port-fix'
i
n
to maint
commit
|
commitdiff
|
tree
2007-11-29
Junio C H
a
mano
per-directory-exclu
d
e: lazily r
e
ad
.
gitignore
f
iles
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-11-29
Junio C Haman
o
dir
.
c: minor clean-up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-11-29
Junio C Hamano
git-config --get
-
color
:
get co
n
figured c
o
l
or
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-11-29
J
u
n
i
o C Haman
o
"co
l
or
.
dif
f
= true" is
n
ot "always" an
y
more
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-11-29
Junio C Hamano
Merge b
r
an
c
h
'
maint'
commit
|
commitdiff
|
tree
2007-11-29
Junio
C Hamano
scripts: do not g
e
t confu
s
e
d
with HEAD in work t
r
ee
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-11-26
Jun
i
o C
H
amano
Merge b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
2007-11-26
Junio C H
a
mano
Merg
e
branc
h
'mai
n
t
'
of git://linux-nf
s
.
org/~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-11-25
Ju
n
io C Ha
m
an
o
r
e
vert/cherry-pick: do not mentio
n
the original ref
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-11-25
Junio C
H
a
mano
"
g
i
t
-ta
g
-s" s
h
ould create
a
signe
d
an
n
o
t
ated
tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-11-25
Junio C H
a
mano
git-che
c
kout: descri
b
e
detached hea
d
c
o
rre
c
tl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-11-25
Junio C Hamano
a
dd -i:
F
i
x
r
unning from a su
b
directory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-11-25
Junio C
Hamano
bui
l
tin-add: fix comma
n
d line buil
d
ing
to call in
t
e
r
active
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-11-25
J
unio
C Ha
m
a
no
Merge
b
ran
c
h
'
kh
/
commit
'
int
o
wc/add-i
commit
|
commitdiff
|
tree
2007-11-25
Jun
i
o
C Ha
m
ano
U
p
da
t
e draf
t
release notes for 1
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-11-25
Junio C Hamano
Merge br
a
nch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-11-25
Junio C Hamano
Merge branch 'r
v
/maint-i
n
d
e
x-
c
ommi
t
' into maint
commit
|
commitdiff
|
tree
2007-11-25
Junio C Hamano
M
e
rge branch
'lt/maint-rev
-
list-
g
i
t
link' into m
a
int
commit
|
commitdiff
|
tree
2007-11-25
J
unio C
Hama
n
o
M
erge bran
c
h 'jc/
m
aint-add-sync-st
a
t' i
n
t
o mai
n
t
commit
|
commitdiff
|
tree
2007-11-25
Junio C H
a
mano
Merge branch
'
jc/maint-format-patch-
e
nco
d
ing' into
.
.
.
commit
|
commitdiff
|
tree
2007-11-25
Junio C Hamano
Merge
b
ra
n
ch '
b
s/maint-t
7
005' in
t
o main
t
commit
|
commitdiff
|
tree
2007-11-25
Junio
C Hama
n
o
Merg
e
branc
h
'bs/maint-commi
t
-
optio
n
s'
i
n
to maint
commit
|
commitdiff
|
tree
2007-11-25
J
u
nio C Haman
o
Deprecate peek-remote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-11-25
Junio C Haman
o
c
ore
.
whitespace: document
a
t
io
n
update
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next