aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'jk/add-p-skip-conflicts' into maintJunio C Hamano2012-04-26
|\
| * add--interactive: ignore unmerged entries in patch modeJeff King2012-04-05
* | Merge branch 'jc/commit-hook-authorship' into maintJunio C Hamano2012-04-26
|\ \
| * | commit: pass author/committer info to hooksJunio C Hamano2012-03-11
| * | t7503: does pre-commit-hook learn authorship?Junio C Hamano2012-03-11
| * | ident.c: add split_ident_line() to parse formatted ident lineJunio C Hamano2012-03-11
* | | Merge branch 'tr/maint-word-diff-regex-sticky' into maintJunio C Hamano2012-04-26
|\ \ \
| * | | diff: tweak a _copy_ of diff_options with word-diffThomas Rast2012-03-14
| * | | diff: refactor the word-diff setup from builtin_diff_cmdThomas Rast2012-03-14
| * | | t4034: diff.*.wordregex should not be "sticky" in --word-diffJohannes Sixt2012-03-14
* | | | Merge branch 'jh/notes-merge-in-git-dir-worktree' into maintJunio C Hamano2012-04-26
|\ \ \ \
| * | | | notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwdJohan Herland2012-03-15
| * | | | notes-merge: use opendir/readdir instead of using read_directory()Johan Herland2012-03-15
| * | | | t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/Johan Herland2012-03-15
| * | | | remove_dir_recursively(): Add flag for skipping removal of toplevel dirJunio C Hamano2012-03-15
| | |/ / | |/| |
* | | | Sync with 1.7.9.7Junio C Hamano2012-04-26
|\ \ \ \
| * | | | Git 1.7.9.7v1.7.9.7Junio C Hamano2012-04-26
| * | | | Sync with 1.7.8.6Junio C Hamano2012-04-26
| |\ \ \ \
| | * | | | Git 1.7.8.6v1.7.8.6Junio C Hamano2012-04-26
| | * | | | Sync with 1.7.7.7Junio C Hamano2012-04-26
| | |\ \ \ \
| | | * | | | Git 1.7.7.7v1.7.7.7Junio C Hamano2012-04-26
| | | * | | | bundle: remove stray single-quote from error messageJonathan Nieder2012-04-26
* | | | | | | Merge branch 'maint-1.7.9' into maintJunio C Hamano2012-04-10
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'maint-1.7.8' into maint-1.7.9Junio C Hamano2012-04-10
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch 'jc/maint-verify-objects-remove-pessimism' into maint-1.7.8Junio C Hamano2012-04-09
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'dw/gitweb-doc-grammo' into maint-1.7.8Junio C Hamano2012-04-09
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'tr/cache-tree' into maint-1.7.8Junio C Hamano2012-04-09
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'cb/maint-t5541-make-server-port-portable' into maint-1.7.8Junio C Hamano2012-04-09
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'cn/maint-rev-list-doc' into maint-1.7.8Junio C Hamano2012-04-09
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'tr/maint-bundle-boundary' into maint-1.7.8Junio C Hamano2012-04-09
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/maint-bundle-long-subject' into maint-1.7.8Junio C Hamano2012-04-09
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ph/rerere-doc' into maint-1.7.8Junio C Hamano2012-04-09
| | |\ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | test-subprocess: fix segfault without argumentsRené Scharfe2012-04-10
* | | | | | | | | | | | | | | submodule: fix prototype of gitmodules_configRené Scharfe2012-04-10
* | | | | | | | | | | | | | | Git 1.7.10v1.7.10Junio C Hamano2012-04-06
* | | | | | | | | | | | | | | spec: add missing build dependencyFelipe Contreras2012-04-06
* | | | | | | | | | | | | | | Git 1.7.10-rc4v1.7.10-rc4Junio C Hamano2012-04-03
* | | | | | | | | | | | | | | Merge branch 'pt/gitk'Junio C Hamano2012-04-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | gitk: fix setting font display with new tabbed dialog layout.Pat Thoyts2012-04-02
| * | | | | | | | | | | | | | | gitk: fix tabbed preferences construction when using tcl 8.4Pat Thoyts2012-04-02
* | | | | | | | | | | | | | | | Sync with 1.7.9.6Junio C Hamano2012-04-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Git 1.7.9.6v1.7.9.6Junio C Hamano2012-04-02
| * | | | | | | | | | | | | | | Merge branch 'jc/maint-merge-autoedit' into maintJunio C Hamano2012-04-02
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | merge: backport GIT_MERGE_AUTOEDIT supportJunio C Hamano2012-03-20
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2012-04-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | l10n: Add the Dutch translation team and initialize nl.poVincent van Ravesteijn2012-04-02
| * | | | | | | | | | | | | | | | l10n: Inital Portuguese Portugal language (pt_PT)Marco Sousa2012-04-02
| * | | | | | | | | | | | | | | | l10n: Improve zh_CN translation for Git 1.7.10-rc3Jiang Xin2012-03-30
* | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-03-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | string-list: document that string_list_insert() inserts unique stringsHeiko Voigt2012-03-30