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
rebase -i: align variable names
2011-02-10
M
a
rtin von Zweigbergk
rebase -i: align variable n
a
mes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weig
b
er
g
k
rebase: show consistent conflic
t
res
o
lution
hint
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigber
g
k
reb
a
se:
extract am code to ne
w
source file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
base: extract merge code
to ne
w
source f
i
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: rem
o
ve $
b
ranch
a
s synon
y
m for $orig_head
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
artin
v
on Zwe
i
gberg
k
reb
a
s
e
-i:
s
upp
o
rt --s
t
at
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigberg
k
rebase: factor out call to
p
re-re
b
ase hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
e
i
gb
e
r
gk
rebas
e
: factor out
c
l
ean work
tree check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
w
eigbe
r
gk
reba
s
e: factor out reference p
a
rsing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
ti
n
von
Z
weigbergk
reba
s
e: reor
d
e
r validati
o
n steps
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
vo
n
Zwei
g
b
e
rgk
rebase -i
:
r
e
move now unnecessa
r
y directory
checks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigb
e
rgk
rebase: factor
o
ut command
l
ine option processing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reb
a
se
:
a
l
ign
variable co
n
tent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
r
e
base
:
ali
g
n variable
n
ames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: stricter
c
heck of stan
d
a
l
o
n
e sub
c
omman
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zwei
g
ber
g
k
r
ebase:
act on command line outside pa
r
si
n
g loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigb
e
rg
k
rebase: imp
r
ove detection
o
f re
b
ase in pr
o
gress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweig
b
ergk
reba
s
e: remov
e
unused rebase state
'prev_hea
d
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
rebase: read state outs
i
d
e
loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
g
b
e
rgk
re
b
ase: refactor
r
e
ading of state
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zw
e
igbergk
rebase:
c
learer names for directory variable
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Junio C Ha
m
ano
M
erge branch 'tr
/
merge-unborn-clob
b
e
r'
commit
|
commitdiff
|
tree
2011-02-10
J
u
nio C Ha
m
ano
Merge
branch
'
jc/unpack-
t
re
e
s
'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Merge b
r
anc
h
'jc/fsc
k
-fixes'
commit
|
commitdiff
|
tree
2011-02-10
J
unio
C Hamano
M
erge branch
'tr/diff-words-test'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Merge branch 'rr/fi-import-m
a
rks-if-exists'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C Hamano
Merge
b
ra
n
ch 'jn/unpack
-
l
s
tat-failure-rep
o
rt'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Merge branch 'e
f
/alia
s
-
v
ia
-
run-command'
commit
|
commitdiff
|
tree
2011-02-10
Junio C H
a
mano
Merge branch
'cb/setup'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Ha
m
a
n
o
Merge branch '
a
e/better-temp
l
ate-fa
i
lure-report'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Merge branch
'jn/cherry-
p
ick-strategy-option'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
M
erge
b
ranch 'maint-1
.
7
.
0' into maint
commit
|
commitdiff
|
tree
2011-02-10
Jonathan Nieder
fast-import: introd
u
ce "feature
notes" command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Jonathan Nieder
fast-import
:
c
larify do
c
um
e
nta
t
ion of
"
f
e
a
ture" co
m
mand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-09
Uwe Kleine-K
ö
n
ig
D
ocum
e
nt
a
tion/merge
s
ubtree Ho
w
-To: fix typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jens Leh
m
ann
p
u
ll
:
Document the "--[no-]recurse-submodu
l
es" options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jonathan Nieder
quote
.
h: simpl
i
f
y
the inclusion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn Thái Ngọc Duy
s
h
a1_obj
e
ct_info:
examine cached_obj
e
ct store
t
o
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn
T
hái Ngọ
c
D
u
y
s
h
a1_file
.
c:
m
o
ve f
i
nd_c
a
c
he
d
_object up so s
h
a1_objec
t
_info
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguy
ễ
n Thái Ngọc D
u
y
Add c
o
ns
t
to parse_{
c
om
m
it,tag}_buffer()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguy
ễ
n Thái Ngọc Duy
diff: support
--cach
e
d
o
n unborn branches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jakub
N
are
b
ski
gitweb:
M
ention
optional Pe
r
l
modules in INSTALL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Sita
r
am
Chamarty
pos
t
-receive-e
m
ail: suppress error if descripti
o
n file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
P
a
t Th
o
yts
t7407
:
fix line endings fo
r
mingw bu
i
l
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Johannes
Sixt
t
4
120-appl
y
-popt
:
hel
p
systems with core
.
file
m
o
de=
f
alse
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Pat Thoyt
s
t3509: u
s
e u
n
constrained initial test to setup repo
s
ito
r
y
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Johannes S
i
xt
start_com
m
and: flush bu
f
fers in the WIN
3
2
code path
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
S
hawn
O
.
P
e
arce
bundle: Use OFS_DELTA in b
u
nd
l
e files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-31
Junio C H
a
mano
Mer
g
e br
a
nch 'jl/fetch-
s
ubmod
u
le-recur
s
ive' into m
a
int
commit
|
commitdiff
|
tree
2011-01-31
Jens Lehm
a
n
n
t55
2
6: Fix wrong argum
e
nt or
d
er
in "git c
o
n
f
ig"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-31
Junio C
H
a
mano
G
i
t 1
.
7
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jun
i
o C Hamano
fsck: do not g
i
ve up too earl
y
i
n
f
s
ck_dir
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
J
u
ni
o
C Hamano
fsck: dro
p
unused p
a
ramet
e
r from tr
a
v
erse_one
_
object
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Adam Tkac
D
o
n
't pass "--xhtml"
t
o hightlight in gitweb
.
per
l
script
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Junio C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2011-01-27
Jo
n
a
t
han Nieder
re
b
ase -i:
c
larify in-editor doc
u
m
e
ntati
o
n of "exec
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
t
e
sts: sanitize more git
environment
v
ari
a
bles
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
J
u
n
i
o
C Hamano
M
e
rge branch 'jn/fast-import-empty-tre
e
-removal' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-01-27
Jon
a
than Nieder
fa
s
t-import: treat
f
ilemodify
w
ith e
m
pty tree
a
s del
e
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
reba
s
e
:
give
a bett
e
r error message for b
o
g
us branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Je
f
f King
r
ebase: use
explicit
"
-
-
" with che
c
kout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Junio C
H
am
a
no
G
i
t
1
.
7
.
4-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Junio C Hamano
Merge branch '
a
s/userdiff
-
pascal'
commit
|
commitdiff
|
tree
2011-01-24
Junio C Ham
a
no
Merge b
r
anch 'jn/setu
p
-
f
ixes'
commit
|
commitdiff
|
tree
2011-01-24
Jonat
h
an
N
ieder
t1510:
f
ix typo in the comment of
a tes
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Jun
i
o C Ham
a
n
o
Documentation updates for 'G
I
T_WORK_TREE w
i
thout G
I
T_DIR
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-21
Jo
n
athan Nieder
Subject: setup:
o
f
f
icially suppo
r
t -
-
wo
r
k-tree without
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-21
Jonat
h
an
N
ieder
Doc
u
mentation: do
not trea
t
r
e
s
e
t
-
-
keep as a
s
pecial
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-20
Björn Stei
n
brink
Correct
l
y report
cor
r
upted
o
b
ject
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
J
onathan Niede
r
tests: compress the setup tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Jonathan Nied
e
r
t
e
sts:
c
osmetic improvements to the repo-setup tes
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Junio C H
a
man
o
Merge bra
n
ch
'
maint'
commit
|
commitdiff
|
tree
2011-01-19
Eri
k
Fa
y
e
-Lund
exec_cmd: remove unused ext
e
r
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Junio
C
Hamano
M
e
rge branch 'jn/gitw
e
b-no-logo' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-01-19
Junio C
Ha
m
ano
Merge br
a
nch '
j
k/diff-driver-binary-d
o
c
'
in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-01-19
Jun
i
o C Hamano
Merge branch 'tr
/
submodule-
r
elative-scp-url
'
into
m
aint
commit
|
commitdiff
|
tree
2011-01-19
Ju
n
io C Ha
m
ano
Merge branch 'rj/maint-
d
ifftool-cygwin-workaround'
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Junio C
H
a
mano
Merge branch 'r
j
/mai
n
t-test-fix
e
s
'
into maint
commit
|
commitdiff
|
tree
2011-01-19
Ju
n
io C H
a
m
a
no
Merge branch
'
jn/maint-gitweb-pathinfo-fix'
in
t
o
mai
n
t
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
M
e
rge branch 'ak/describe-exact
'
into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
M
erge branc
h
'jn/maint-fast-import-object-reuse' into
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Junio C
Hamano
M
erge b
r
anch 'jn/submodule
-
b-current' into maint
commit
|
commitdiff
|
tree
2011-01-19
J
unio C
H
a
m
a
n
o
M
erge branch 'jc
/
maint-svn-info-test-fix' i
n
to maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hama
n
o
Merge
bra
n
c
h
'nd/main
t
-re
l
ative' into
maint
commit
|
commitdiff
|
tree
2011-01-19
Jonathan Ni
e
der
Documentation/fa
s
t-
i
mport: put explanation
o
f
M 040000
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Ramsay Jones
s
vndum
p
.
c: Fix a printf fo
r
ma
t
c
ompiler
w
arning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jo
n
athan Ni
e
d
er
remote-ext:
do not segfault for bla
n
k
lines
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jonathan Nieder
Do
c
umentatio
n
/
fa
s
t-import
:
capitaliz
e
be
g
inning of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Junio C Hamano
t40
3
4 (diff --word
-
di
f
f): add a minimum Perl drier
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jonathan
Nieder
t
4
034 (diff --
w
ord-d
i
ff)
:
styl
e
suggestions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jo
n
athan Niede
r
userdiff: simplify
w
o
rd-d
i
ff
s
af
e
g
u
ard
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Tho
m
as Ra
s
t
t
4034
:
bul
k
verify b
u
il
t
i
n w
o
rd regex sanity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Ramkumar
Ram
a
c
h
andra
f
a
st-i
m
port: Intro
d
uc
e
--import-marks-if-e
x
ists
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-16
J
o
n
ath
a
n
N
iede
r
ll-merge: simplify opts ==
NULL cas
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-13
Junio C H
a
m
ano
Git 1
.
7
.
4-r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-13
Junio
C
Hamano
Merge b
r
a
n
ch 'jn/gitweb-
n
o-logo'
commit
|
commitdiff
|
tree
2011-01-13
J
u
n
i
o C Ha
m
ano
Mer
g
e b
r
anc
h
'jn
/
perl
-
f
uncname'
commit
|
commitdiff
|
tree
2011-01-13
Junio C Hamano
Merge branch
'
sr/gitweb
-
h
i
lite-more'
commit
|
commitdiff
|
tree
2011-01-13
Junio C Hamano
Merge
b
ranc
h
'rj/svn-test'
commit
|
commitdiff
|
tree
2011-01-13
Ju
n
io C Hamano
Merge br
a
nch
'rj
/
test-fixes'
commit
|
commitdiff
|
tree
next