repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
checkout --ours/--theirs: allow checking out one side of a conflicting merge
2008-08-31
Junio C Hamano
checkout --ours/--theirs: allow ch
e
c
king out one sid
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C
H
a
mano
checkout -f: allow
i
gnoring
u
nm
e
r
ged paths w
h
en checking
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C H
a
mano
chec
k
out: do not chec
k
out unmerged higher
stages random
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
ctype
.
c:
protect t
i
ny C preproc
e
ssor con
s
tant
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C
H
aman
o
GIT
1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge bran
c
h 'a
g
/main
t
-co
m
bine-diff-fix' into m
a
i
n
t
commit
|
commitdiff
|
tree
2008-08-24
Junio
C Hamano
M
erge branch 'mv/maint-merge-fix' into maint
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
merge: fix numer
u
s bugs around "t
r
i
v
ial me
r
ge" area
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C H
a
mano
unpac
k
_trees()
:
protect the
han
d
crafted in-c
o
r
e inde
x
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C
H
amano
Update draft
release notes for
1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
"
g
it-
m
erg
e
": allow fast-fo
r
war
d
i
n
g
in a stat-dirty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Ha
m
ano
completi
o
n: fi
n
d
out
s
upport
e
d
merge strategies
cor
r
ectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
u
nio
C Hama
n
o
f
o
r-each-ref: cope wit
h
t
a
gs
w
i
th incom
p
let
e
lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
u
n
i
o C Haman
o
diff --check: do not get confused by new blank li
n
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
J
u
nio C Hamano
Start 1
.
6
.
0
.
X ma
i
ntenance se
r
ies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio
C Hamano
G
IT 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Merge git-gui 0
.
11
.
0
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Merge branc
h
'
ak
/
p4'
commit
|
commitdiff
|
tree
2008-08-17
Junio C Haman
o
Merge gi
t
:/
/
g
i
t
.
ke
r
nel
.
org/pub/scm/
g
it
k
/gitk
commit
|
commitdiff
|
tree
2008-08-14
Juni
o
C H
a
mano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2008-08-13
Junio C H
a
man
o
GI
T
1
.
6
.
0-rc
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Junio C Hamano
M
er
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-08-13
Ju
n
i
o C Hama
n
o
Do not tal
k
about "
d
iff
"
in rev-list d
o
cu
m
entation
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Jun
i
o C
H
a
mano
Merge git://git
.
b
ogom
i
ps
.
org
/
git-svn
commit
|
commitdiff
|
tree
2008-08-12
Junio C Ha
m
ano
diff --
c
h
eck
:
d
o
n
o
t u
n
conditionally
complain about
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Junio C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-08-11
Jun
i
o C H
a
mano
M
erge
branch 'maint'
commit
|
commitdiff
|
tree
2008-08-11
Junio
C
Hama
n
o
Re-fix
r
ev
-
l
i
s
t-opti
o
ns documentatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Juni
o
C Hamano
Merg
e
branch
'maint'
commit
|
commitdiff
|
tree
2008-08-11
J
u
n
io C Hamano
Fix deleting r
e
flog
e
ntries from HEAD reflog
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-09
Ju
n
io
C
Hamano
Update draft
R
el
N
otes fo
r
1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-09
Junio C
Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2008-08-09
Junio C H
a
m
a
no
mailinfo:
f
ix
MIME multi-part message boundary
h
andli
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-08
Junio
C Hamano
GIT-
V
ERSION-GEN: mark
the
v
ers
i
on 'di
r
ty' only if
th
e
re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-08
Junio C Hama
n
o
asciidoc markup
f
ixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-07
Junio C
H
amano
Merge
b
r
an
c
h 'lt/config-fsy
n
c'
into m
a
i
nt
commit
|
commitdiff
|
tree
2008-08-07
Junio
C Hamano
Merge branch 'jc/reflog-expire
'
into maint
commit
|
commitdiff
|
tree
2008-08-07
Junio C
Hamano
Mer
g
e branch 'a
g
/rewr
i
te_one' int
o
maint
commit
|
commitdiff
|
tree
2008-08-06
Juni
o
C Hamano
G
I
T 1
.
6
.
0-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
Junio
C
H
amano
Syn
c
with
1
.
5
.
6
.
5
commit
|
commitdiff
|
tree
2008-08-06
J
u
nio C H
a
mano
G
IT 1
.
5
.
6
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
Fi
l
e
s give
n
on
t
h
e
command li
n
e are
r
elative to $cwd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
J
u
nio C Haman
o
M
er
g
e gi
t
://repo
.
or
.
cz
/
gi
t
-
gui
commit
|
commitdiff
|
tree
2008-08-06
Junio
C Hamano
Merge git://git
.
kernel
.
org/pu
b
/scm/gitk/g
i
t
k
commit
|
commitdiff
|
tree
2008-08-06
J
unio C Hamano
Merge branch 'rs/a
r
chive-parse-o
p
tions'
commit
|
commitdiff
|
tree
2008-08-06
Junio C
Hamano
fix
d
iff-tree
--stdin docum
e
n
t
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
Junio
C
H
a
ma
n
o
Mer
g
e bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
RelNotes
1
.
5
.
6
.
5 updates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-03
Junio C Hamano
Merge br
a
nch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2008-08-02
Jun
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-02
J
u
n
io C
Hamano
bui
l
tin-name
-
rev
.
c:
s
plit deeply nes
t
ed p
a
rt
fro
m
t
h
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-02
Junio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2008-08-02
Junio C Hamano
St
a
rt 1
.
5
.
6
.
5 RelNot
e
s to des
c
ribe accumulate
d
fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-02
Jun
i
o
C
Hamano
Upda
t
e my e-mail address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-02
Junio C Ham
a
no
Docu
m
ent
a
t
ion: c
l
arify
di
f
f --c
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-02
Jun
i
o
C Hamano
make sure pars
e
d wi
l
dcard refspec ends
w
i
t
h slash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-31
Junio C H
a
mano
Teach --fin
d
-copies
-
h
a
rder to "git blame
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Junio
C
H
aman
o
Fix test-parse-o
p
t
i
ons
"
i
nteger" test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
J
unio C Ha
m
ano
Fix
mer
g
e name g
e
neration in "merge in C"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Junio C Hamano
Merge git://repo
.
or
.
c
z
/gi
t
-
g
ui
commit
|
commitdiff
|
tree
2008-07-30
Ju
n
io C H
a
man
o
Teach gitlinks to
i
e_modi
f
ied()
and ce_
m
o
d
ified_
c
he
c
k
_
f
s()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Junio C Hamano
t7
0
01:
f
ix "
g
i
t
mv
"
test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Junio
C Hamano
Docume
n
tat
i
on: c
l
arify
what is shown in "git-ls-fil
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Ju
n
io C
H
amano
ls-tree
d
o
c
umentation
:
enhance
notes on subdirectory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-28
Jun
i
o
C
Ha
m
ano
Allow inst
a
lling in the
traditional way
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-28
Junio C Haman
o
Allo
w
building wit
h
o
ut a
n
y
git i
n
stalled
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Junio C Hamano
GIT 1
.
6
.
0-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Junio C Hamano
make sure
par
s
ed
w
ild
c
a
rd r
e
fspec en
d
s with
sl
a
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Junio C H
a
mano
M
erge git://re
p
o
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-07-25
J
u
nio C
H
aman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-07-25
Junio C Hamano
Docu
m
entation: clarify
ho
w
to disable ele
m
ents in core
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Jun
i
o C H
a
m
a
no
Mak
e
file: fix shell quoting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Junio C Hamano
tests: propagate $(
T
AR) down f
r
o
m the tople
v
el Makefile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
J
u
nio C Hamano
Merge branch 'ph
/
checkout'
commit
|
commitdiff
|
tree
2008-07-24
J
u
nio C
H
a
m
ano
Merge branch '
m
ain
t
' into ph/checkout
commit
|
commitdiff
|
tree
2008-07-24
J
u
nio C Ham
a
no
ignore non-e
x
isten
t
refs in dwim_log()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio C Hamano
Documentation: clarify diff
--cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Juni
o
C
Hamano
bui
l
tin-b
r
a
nch
.
c: optimize --m
e
rged
a
nd --no-mer
g
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio C Hamano
buil
t
in-branch
.
c:
re
m
ove unu
s
ed code in append
_
r
e
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio C Hamano
s
t
a
sh save: fi
x
p
a
rame
t
er handl
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Junio
C
Ha
m
an
o
t
e
sts: do not rely on ex
t
erna
l
"patc
h
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Junio C Haman
o
Revert "ma
k
e gi
t
-status use a pager"
commit
|
commitdiff
|
tree
2008-07-21
Ju
n
io C H
a
mano
Update my
e
-mail address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
J
unio C
H
amano
Merge branch 'ap/trackinfo'
commit
|
commitdiff
|
tree
2008-07-21
Ju
n
io
C
Hamano
Merge
branch 'jc/r
e
rere-auto
-
more'
commit
|
commitdiff
|
tree
2008-07-21
Juni
o
C
Hama
n
o
Merge b
r
anch 'n
s
/am-
a
bort'
commit
|
commitdiff
|
tree
2008-07-21
Ju
n
io C Ham
a
no
Merge branch
'jc/add-ad
d
remov
e
'
commit
|
commitdiff
|
tree
2008-07-21
Juni
o
C Hama
n
o
"needs update" c
o
nsidered ha
r
mful
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio C
H
am
a
no
M
ov
e
r
e
a
d_
i
n_f
u
l
l() a
n
d write_in_f
u
ll()
to wr
a
p
per
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Ju
n
io
C
Hamano
Link shell
w
i
th compat l
a
y
e
r
funct
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio C Ham
a
no
Merge b
r
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-07-20
J
u
nio C
H
amano
re
f
resh
-
i
n
dex: fix
b
i
t
m
ask assignment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
J
u
nio C Hamano
git-add --all: d
o
cumentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
J
u
nio
C Hamano
git-
a
d
d
--all: tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
J
unio C
H
a
ma
n
o
git-add --al
l
: add all fil
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Ju
n
io C Hamano
builtin-add
.
c
:
re
s
tr
u
ctur
e
the code for maintainability
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Hamano
Getting
c
l
o
se
r
to 1
.
6
.
0-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
J
u
nio C
H
amano
Mer
g
e br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2008-07-19
Junio
C Hamano
.
mailmap update
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio
C
Hamano
t9
0
01 (s
e
nd-email): D
o
not us
e
h
a
rd
c
o
d
ed /bin/sh in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next