summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/send-email-reconfirm-fix'Junio C Hamano2012-09-121-2/+4
|\
| * send-email: initial_to and initial_reply_to are both optionalStephen Boyd2012-09-061-2/+4
* | Merge branch 'nd/maint-remote-remove'Junio C Hamano2012-09-125-9/+10
|\ \
| * | remote: prefer subcommand name 'remove' to 'rm'Nguyễn Thái Ngọc Duy2012-09-065-9/+10
* | | Merge branch 'nd/log-n-doc'Junio C Hamano2012-09-122-5/+4
|\ \ \
| * | | doc: move rev-list option -<n> from git-log.txt to rev-list-options.txtNguyễn Thái Ngọc Duy2012-09-062-5/+4
* | | | Merge branch 'kd/cvsimport-avoid-invalid-tag'Junio C Hamano2012-09-121-3/+30
|\ \ \ \
| * | | | cvsimport: strip all inappropriate tag stringsKen Dreyer2012-09-061-3/+30
* | | | | Merge branch 'js/compat-itimer'Junio C Hamano2012-09-122-0/+23
|\ \ \ \ \
| * | | | | Add a no-op setitimer() wrapperJoachim Schmitz2012-09-082-0/+23
* | | | | | Merge branch 'js/compat-mkdir'Junio C Hamano2012-09-121-0/+6
|\ \ \ \ \ \
| * | | | | | Document MKDIR_WO_TRAILING_SLASH in MakefileJoachim Schmitz2012-09-081-0/+6
* | | | | | | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2012-09-121-0/+5
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'da/gitk-reload-tag-contents' of git://github.com/gitster/gitPaul Mackerras2012-09-121-6/+7
| |\ \ \ \ \ \ \
| * | | | | | | | gitk: Fix GIT_TRACE issuesAske Olsson2012-08-041-0/+5
* | | | | | | | | Merge branch 'da/gitk-reload-tag-contents'Junio C Hamano2012-09-121-8/+9
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | gitk: Rename 'tagcontents' to 'cached_tagcontent'David Aguilar2012-09-081-7/+7
| * | | | | | | | gitk: Teach "Reread references" to reload tagsDavid Aguilar2012-09-081-1/+2
| |/ / / / / / /
| * | | | | | | gitk: Avoid Meta1-F5Felipe Contreras2012-04-251-2/+2
* | | | | | | | Second half of the fifth batch for 1.8.0Junio C Hamano2012-09-111-45/+17
* | | | | | | | Merge branch 'rj/test-regex'Junio C Hamano2012-09-114-0/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | test-regex: Add a test to check for a bug in the regex routinesRamsay Jones2012-09-024-0/+27
* | | | | | | | | Merge branch 'jk/argv-array'Junio C Hamano2012-09-116-39/+58
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodule: use argv_array instead of hand-building arraysJens Lehmann2012-09-023-17/+19
| * | | | | | | | | fetch: use argv_array instead of hand-building arraysJeff King2012-09-021-22/+25
| * | | | | | | | | argv-array: fix bogus cast when freeing arrayJeff King2012-09-021-1/+1
| * | | | | | | | | argv-array: add pop functionJeff King2012-09-023-0/+14
* | | | | | | | | | Merge branch 'jc/merge-bases'Junio C Hamano2012-09-1111-112/+184
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | reduce_heads(): reimplement on top of remove_redundant()Junio C Hamano2012-08-311-38/+18
| * | | | | | | | | | merge-base: "--is-ancestor A B"Junio C Hamano2012-08-312-0/+50
| * | | | | | | | | | get_merge_bases_many(): walk from many tips in parallelJunio C Hamano2012-08-301-21/+58
| * | | | | | | | | | in_merge_bases(): use paint_down_to_common()Junio C Hamano2012-08-301-10/+7
| * | | | | | | | | | merge_bases_many(): split out the logic to paint historyJunio C Hamano2012-08-301-19/+28
| * | | | | | | | | | in_merge_bases(): omit unnecessary redundant common ancestor reductionThomas Rast2012-08-281-1/+4
| * | | | | | | | | | http-push: use in_merge_bases() for fast-forward checkJunio C Hamano2012-08-271-2/+1
| * | | | | | | | | | receive-pack: use in_merge_bases() for fast-forward checkJunio C Hamano2012-08-271-7/+1
| * | | | | | | | | | in_merge_bases(): support only one "other" commitJunio C Hamano2012-08-277-18/+21
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'nd/i18n-index-pack'Junio C Hamano2012-09-111-10/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | i18n: mark more index-pack strings for translationNguyễn Thái Ngọc Duy2012-08-311-10/+11
* | | | | | | | | | | Merge branch 'jc/maint-ident-missing-human-name'Junio C Hamano2012-09-112-3/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | split_ident_line(): make best effort when parsing author/committer lineJunio C Hamano2012-08-312-3/+20
* | | | | | | | | | | | Sync with maintJunio C Hamano2012-09-113-34/+70
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Further merging down for 1.7.12.1Junio C Hamano2012-09-111-0/+13
| * | | | | | | | | | | | Sync with 1.7.11.6Junio C Hamano2012-09-1132-392/+569
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Git 1.7.11.6v1.7.11.6Junio C Hamano2012-09-113-35/+58
| | * | | | | | | | | | | | Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11Junio C Hamano2012-09-111-273/+308
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sz/submodule-force-update' into maint-1.7.11Junio C Hamano2012-09-113-2/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ph/stash-rerere' into maint-1.7.11Junio C Hamano2012-09-112-0/+39
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-sane-execvp-notdir' into maint-1.7.11Junio C Hamano2012-09-111-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-config-exit-status' into maint-1.7.11Junio C Hamano2012-09-113-6/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status