index
:
org/kernel/git.git
master
forked from git/git
git
about
summary
refs
log
tree
commit
diff
log msg
author
committer
range
Commit message (
Expand
)
Author
Age
*
Merge branch 'jc/fix-add-u-unmerged' into maint
Junio C Hamano
2011-05-16
|
\
|
*
Fix "add -u" that sometimes fails to resolve unmerged paths
Junio C Hamano
2011-04-23
*
|
Merge branch 'jn/gitweb-dependency' into maint
Junio C Hamano
2011-05-16
|
\
\
|
*
|
Remove gitweb/gitweb.cgi and other legacy targets from main Makefile
Jakub Narebski
2011-05-08
|
*
|
git-instaweb: Simplify build dependency on gitweb
Jakub Narebski
2011-05-08
*
|
|
Merge branch 'jc/maint-branch-mergeoptions' into maint
Junio C Hamano
2011-05-16
|
\
\
\
|
*
|
|
merge: make branch.<name>.mergeoptions correctly override merge.<option>
Junio C Hamano
2011-05-06
*
|
|
|
Merge branch 'jc/maint-add-p-overlapping-hunks' into maint
Junio C Hamano
2011-05-16
|
\
\
\
\
|
*
|
|
|
t3701: add-p-fix makes the last test to pass
Junio C Hamano
2011-05-08
|
*
|
|
|
"add -p": work-around an old laziness that does not coalesce hunks
Junio C Hamano
2011-04-29
|
*
|
|
|
add--interactive.perl: factor out repeated --recount option
Junio C Hamano
2011-04-29
|
*
|
|
|
t3701: Editing a split hunk in an "add -p" session
Junio C Hamano
2011-04-29
|
*
|
|
|
add -p: 'q' should really quit
Junio C Hamano
2011-04-29
*
|
|
|
|
Documentation/git-fsck.txt: fix typo: unreadable -> unreachable
Jim Meyering
2011-05-16
*
|
|
|
|
Update draft release notes to 1.7.5.2
Junio C Hamano
2011-05-15
*
|
|
|
|
Merge branch 'cn/format-patch-quiet' into maint
Junio C Hamano
2011-05-15
|
\
\
\
\
\
|
*
|
|
|
|
format-patch: document --quiet option
Carlos Martín Nieto
2011-04-12
|
*
|
|
|
|
format-patch: don't pass on the --quiet flag
Carlos Martín Nieto
2011-04-12
*
|
|
|
|
|
Merge branch 'jm/mergetool-submodules' into maint
Junio C Hamano
2011-05-15
|
\
\
\
\
\
\
|
*
|
|
|
|
|
mergetool: Teach about submodules
Jonathon Mah
2011-04-13
*
|
|
|
|
|
|
Merge branch 'jk/format-patch-quote-special-in-from' into maint
Junio C Hamano
2011-05-15
|
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
pretty: quote rfc822 specials in email addresses
Jeff King
2011-04-26
*
|
|
|
|
|
|
|
Merge branch 'vh/git-svn-doc' into maint
Junio C Hamano
2011-05-15
|
\
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
|
git-svn.txt: small typeface improvements
Valentin Haenel
2011-04-26
|
*
|
|
|
|
|
|
|
git-svn.txt: move option descriptions
Valentin Haenel
2011-04-26
|
*
|
|
|
|
|
|
|
git-svn.txt: fix usage of --add-author-from
Valentin Haenel
2011-04-26
|
|
|
_
|
_
|
_
|
_
|
/
/
|
|
/
|
|
|
|
|
|
*
|
|
|
|
|
|
|
git_open_noatime(): drop unused parameter
Junio C Hamano
2011-05-15
*
|
|
|
|
|
|
|
sha1_file: typofix
Junio C Hamano
2011-05-15
*
|
|
|
|
|
|
|
add, merge, diff: do not use strcasecmp to compare config variable names
Jonathan Nieder
2011-05-14
*
|
|
|
|
|
|
|
Prepare for 1.7.5.2
Junio C Hamano
2011-05-13
*
|
|
|
|
|
|
|
Merge branch 'aw/maint-rebase-i-p-no-ff' into maint
Junio C Hamano
2011-05-13
|
\
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
|
git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
Andrew Wong
2011-04-28
|
|
|
/
/
/
/
/
/
|
|
/
|
|
|
|
|
|
*
|
|
|
|
|
|
|
Merge branch 'js/blame-parsename' into maint
Junio C Hamano
2011-05-13
|
\
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
|
t/annotate-tests: Use echo & cat instead of sed
Brian Gernhardt
2011-05-05
|
*
|
|
|
|
|
|
|
blame: tolerate bogus e-mail addresses a bit better
Josh Stone
2011-04-29
|
|
|
/
/
/
/
/
/
|
|
/
|
|
|
|
|
|
*
|
|
|
|
|
|
|
Merge branch 'gr/cvsimport-alternative-cvspass-location' into maint
Junio C Hamano
2011-05-13
|
\
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
|
Look for password in both CVS and CVSNT password files.
Guy Rouillier
2011-05-01
*
|
|
|
|
|
|
|
|
Merge branch 'cj/p4merge' into maint
Junio C Hamano
2011-05-13
|
\
\
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
|
|
Pass empty file to p4merge where no base is suitable.
Ciaran Jessup
2011-05-01
|
|
|
/
/
/
/
/
/
/
|
|
/
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
|
Merge branch 'jk/merge-one-file-working-tree' into maint
Junio C Hamano
2011-05-13
|
\
\
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
|
|
merge-one-file: fix broken merges with alternate work trees
Jeff King
2011-04-29
|
*
|
|
|
|
|
|
|
|
add tests for merge-index / merge-one-file
Jeff King
2011-04-29
*
|
|
|
|
|
|
|
|
|
Merge branch 'jc/fix-diff-files-unmerged' into maint
Junio C Hamano
2011-05-13
|
\
\
\
\
\
\
\
\
\
\
|
|
|
_
|
_
|
_
|
_
|
_
|
_
|
_
|
/
|
|
/
|
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
|
diff-files: show unmerged entries correctly
Junio C Hamano
2011-04-23
|
*
|
|
|
|
|
|
|
|
diff: remove often unused parameters from diff_unmerge()
Junio C Hamano
2011-04-23
|
*
|
|
|
|
|
|
|
|
diff.c: return filepair from diff_unmerge()
Junio C Hamano
2011-04-23
|
*
|
|
|
|
|
|
|
|
test: use $_z40 from test-lib
Junio C Hamano
2011-04-23
*
|
|
|
|
|
|
|
|
|
Merge branch 'mz/maint-rename-unmerged' into maint
Junio C Hamano
2011-05-13
|
\
\
\
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
|
|
|
diffcore-rename: don't consider unmerged path as source
Martin von Zweigbergk
2011-03-23
*
|
|
|
|
|
|
|
|
|
|
t5400: Fix a couple of typos
Johan Herland
2011-05-13
[next]