repo.or.cz
/
git
/
jrn.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
artin vo
n
Zweigbergk
reba
s
e
-i: align variable
n
a
mes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
reba
s
e: sho
w
con
s
is
t
ent conflict resolution hint
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von
Zweigbergk
reb
a
s
e
:
extract am code to new source file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
reba
s
e: extract merge code to new source file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zw
e
igbergk
r
e
ba
s
e: remove
$br
a
nch as synony
m
for $orig_
h
ead
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zwe
i
gbergk
rebase -i: support --st
a
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igberg
k
r
e
base: fac
t
o
r out call to pre
-
rebase ho
o
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Z
w
eigbergk
r
ebase: fa
c
t
o
r o
u
t clean work
tr
e
e check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n
Zweigber
g
k
reba
s
e: facto
r
out refere
n
ce parsing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
in von Zweigb
e
r
g
k
rebase: reor
d
er validation steps
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von
Z
w
eigbergk
re
b
ase -i: remove
n
ow
unnecessary directory ch
e
cks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbe
r
gk
rebase:
factor out comma
n
d
l
i
ne optio
n
proces
s
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n von Zwei
g
bergk
r
eba
s
e: align variable content
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
vo
n
Zweigbergk
reb
a
se: align variabl
e
n
a
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
eigber
g
k
rebase: stricter
check o
f
standalone sub
c
om
m
and
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
arti
n
von Zw
e
i
g
bergk
r
e
base: act on command line outside pars
i
ng loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
g
k
rebase:
im
p
rov
e
detection of rebase in progress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igb
e
rgk
rebase:
r
e
move unus
e
d
r
ebase stat
e
'p
r
ev_head'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweig
b
er
g
k
reba
s
e: rea
d
s
tate outside loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase:
refactor readi
n
g o
f
s
t
ate
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weig
b
ergk
rebase: clea
r
er
nam
e
s for directory var
i
ables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Juni
o
C Hamano
M
erge br
a
nch 'tr
/
merge-unborn-clobber'
commit
|
commitdiff
|
tree
2011-02-10
Juni
o
C Hamano
Merge branch
'j
c
/
u
npack-trees'
commit
|
commitdiff
|
tree
2011-02-10
Jun
i
o C Hamano
Merge branc
h
'jc/fsck-
f
i
x
es'
commit
|
commitdiff
|
tree
2011-02-10
Junio C H
a
mano
Merge branch 'tr/diff-words-test'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C
H
a
ma
n
o
Me
r
ge bra
n
ch
'
r
r
/fi-import-mark
s
-if-exists'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C
Hamano
Mer
g
e branch 'jn/un
p
ack-lstat-failure-report'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C Hamano
Merge b
r
anch 'ef/alias-via-r
u
n-c
o
mmand'
commit
|
commitdiff
|
tree
2011-02-10
Jun
i
o C Hamano
Merge bran
c
h 'cb/setup'
commit
|
commitdiff
|
tree
2011-02-10
Juni
o
C Hamano
M
e
rge
b
r
anch
'ae/better-template
-
f
a
i
l
ure-report
'
commit
|
commitdiff
|
tree
2011-02-10
Ju
n
i
o C H
a
mano
Merge branc
h
'
j
n/cherr
y
-pick-strategy-option'
commit
|
commitdiff
|
tree
2011-02-10
Juni
o
C Hamano
Merge branch 'maint-1
.
7
.
0' i
n
to maint
commit
|
commitdiff
|
tree
2011-02-10
Jonathan Nieder
fast-im
p
ort
:
introduce "feature
n
o
tes" comm
a
nd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Jonathan Nieder
fa
s
t-impor
t
:
c
l
a
rify
d
ocumentation of "feature
"
command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-09
U
w
e Kleine-
K
önig
Doc
u
m
e
ntation/me
r
ge s
u
b
t
ree How-T
o
:
fix typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jens Lehmann
pull:
D
ocumen
t
the
"--[no-]r
e
curs
e
-s
u
bmodules" options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jon
a
than Nieder
quote
.
h: simplify
t
h
e inclusion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Ngu
y
ễn Thái Ngọc Duy
sha1_object_in
f
o: examine c
a
ched_object sto
r
e too
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn
T
h
ái Ngọc Duy
sha1_file
.
c: move find_cached_object up so sha1_
o
bjec
t
_info
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Ng
u
yễn Thái Ngọ
c
D
u
y
Ad
d
c
onst to
p
arse_{commit,tag}
_
buffer()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
N
guyễn Th
á
i Ngọc Duy
di
f
f: support --cached on unborn branc
h
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jaku
b
Narebski
gitweb: Mention
optional Perl modules in INSTALL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Sita
r
am Chamar
t
y
post-r
e
ceive-email: su
p
press
error if
description
f
i
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
P
at Thoyts
t7407:
fix line e
n
ding
s
for min
g
w
b
uild
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Johan
n
e
s Si
x
t
t4120-apply-popt: hel
p
systems wi
t
h core
.
filemode=false
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
P
at Thoyts
t3509: use
unconstrai
n
ed in
i
tial tes
t
t
o
s
e
tup r
e
po
s
itory
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Johannes Sixt
star
t
_command:
flush buffers
in th
e
WIN
3
2 code path
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
S
h
awn O
.
Pearce
bund
l
e: Use OFS_DE
L
TA in b
u
n
dle
f
ile
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-31
Ju
n
io C Hamano
Merg
e
bra
n
ch 'jl/fetch-submodule-recursi
v
e' into maint
commit
|
commitdiff
|
tree
2011-01-31
Jens
L
ehmann
t5526: Fix wro
n
g argument order in "git conf
i
g
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-31
Junio
C
Hamano
Git 1
.
7
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Junio C Haman
o
f
sck: do not give
u
p
t
oo ea
r
ly in fsck_dir()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Juni
o
C Hamano
fsck: drop unused
parameter from traverse_one_object()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Adam Tkac
Don't pass "--xhtml" to hightlight
in
gitweb
.
per
l
sc
r
ipt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
J
u
ni
o
C Ha
m
ano
M
e
rge branch '
m
a
i
n
t
'
commit
|
commitdiff
|
tree
2011-01-27
Jo
n
athan
Nieder
re
b
ase -i: clarify in-editor documentation of "exec"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
J
e
ff K
i
n
g
tests: s
a
nitize
m
o
re
g
it environme
n
t
vari
a
bles
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
J
u
nio C Hamano
M
e
rg
e
branch 'jn/
f
ast-import-empty-tree-removal' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-01-27
Jonathan Niede
r
fas
t
-
i
mport: t
r
e
a
t
f
i
lemodify with em
p
t
y
tree as delete
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jef
f
King
r
ebase: give a better err
o
r message for bogus
b
ranch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jef
f
Ki
n
g
rebase: use explicit "--" with checkout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Junio
C
Haman
o
Git 1
.
7
.
4-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Junio
C
Hamano
Merge
bra
n
ch 'as/userdi
f
f-pasc
a
l'
commit
|
commitdiff
|
tree
2011-01-24
J
u
nio C Ha
m
ano
Merge
b
ranch 'jn/s
e
tup-fi
x
es'
commit
|
commitdiff
|
tree
2011-01-24
Jonathan Nieder
t15
1
0: fi
x
typ
o
in the comment of a test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Ju
n
io C
Hamano
Documentation
update
s
for '
G
IT_WORK_TREE without
GIT
_
DIR
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-21
J
o
n
athan Nied
e
r
S
u
bject
:
s
et
u
p: officially support --wor
k
-tree witho
u
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-21
Jonat
h
a
n
Nieder
D
ocumentation: do
not treat
reset --keep as a spec
i
al
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-20
B
j
örn Steinbrink
Corre
c
tl
y
report corrupted
o
bjects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
J
onat
h
an Nieder
t
ests: compress the se
t
u
p
test
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Jonatha
n
Nied
e
r
tests: cosmetic impr
o
v
e
ment
s
to the repo-setu
p
t
est
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
J
u
nio C Hamano
M
erge bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2011-01-19
Erik Fay
e
-Lund
exec_cmd:
remove unused extern
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Junio
C
Hamano
Merge branch 'jn/gitweb-no-
l
ogo
'
into
m
a
int
commit
|
commitdiff
|
tree
2011-01-19
Junio C Ha
m
ano
Merge branch
'jk/diff-driv
e
r-binary-doc'
into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio
C H
a
m
a
no
Merge branch 'tr/submodule-relative
-
scp-url' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C
H
a
m
ano
Merge br
a
n
c
h 'rj/maint-
d
ifftoo
l
-cygwin-workaroun
d
'
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merg
e
branch 'rj/main
t
-te
s
t-fixes' into ma
i
nt
commit
|
commitdiff
|
tree
2011-01-19
J
u
nio C Hamano
Merge b
r
anch
'
jn/maint-gi
t
w
eb-pathinfo-fix' into maint
commit
|
commitdiff
|
tree
2011-01-19
J
u
nio C Haman
o
Merge
b
r
an
c
h 'ak/d
e
scribe
-
exact' i
n
to
m
a
i
nt
commit
|
commitdiff
|
tree
2011-01-19
Junio
C
Hamano
Merge br
a
nch 'jn
/
maint-fast-import-obj
e
ct-reuse' into
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Juni
o
C Hama
n
o
Merge
b
ranch 'jn/submod
u
le-b-curren
t
' into
maint
commit
|
commitdiff
|
tree
2011-01-19
J
u
nio C Hamano
Merge br
a
nch 'jc/main
t
-svn-info-test-fix' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
M
e
rge branch
'
nd/ma
i
nt-relative'
in
t
o
maint
commit
|
commitdiff
|
tree
2011-01-19
Jona
t
han Nieder
Docume
n
tation/fast-import: p
u
t explanatio
n
o
f M
0
40000
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Ra
m
s
a
y
J
ones
svndump
.
c: Fi
x
a
pr
i
n
t
f for
m
at compil
e
r warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jonathan N
i
eder
remo
t
e
-e
x
t: d
o
not
s
egfault f
o
r bl
a
nk line
s
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
J
ona
t
han Nieder
Doc
u
mentation/f
a
st-i
m
port:
c
apitaliz
e
beginning of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Junio C Hamano
t
4034 (diff --wo
r
d-diff): add a minimum Perl drier
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jona
t
han Nieder
t4034 (diff
--word-diff):
s
tyle
suggestions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jonat
h
an Nieder
u
serdiff:
s
implify word-diff safegu
a
rd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Th
o
mas Rast
t4034: bulk veri
f
y
b
u
iltin word regex sanity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Ramk
u
mar Ramachandra
fast-imp
o
rt: In
t
roduce --import
-
marks
-
i
f
-exists
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
at
h
an
N
i
eder
ll-merge
:
simp
l
ify o
p
ts ==
NULL cas
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-13
Junio C H
a
man
o
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 branch 'jn/gitweb-no-logo'
commit
|
commitdiff
|
tree
2011-01-13
Junio C Hamano
Merge b
r
anch '
j
n/perl-fu
n
c
name'
commit
|
commitdiff
|
tree
2011-01-13
Jun
i
o C Hamano
M
erge branch 'sr/gitweb-hilite-m
o
r
e'
commit
|
commitdiff
|
tree
2011-01-13
Junio C Hamano
Me
r
g
e br
a
nch 'rj/svn-te
s
t'
commit
|
commitdiff
|
tree
2011-01-13
Junio C
H
amano
Merg
e
branch
'
rj/t
e
st-
f
ixes'
commit
|
commitdiff
|
tree
next